I don't know if this has been brought up before, but it seems like an almost obvious addition to the game. Why not have specialist slots in some of the happiness generating buildings. Happiness specialists (entertainers) would generate a certain amount of happiness and Great Entertainer points. Great Entertainers would be like other great people and be able to start a golden age, build a special improvement, or use a special ability. The special improvement could be a Resort that generates happiness when worked and the special ability could be to end disorder in an annexed city, like instantly building a court house. It seems like this would give some more options for controlling happiness and make larger empires a bit more manageable.