I think a simple fix would be for puppets to add more unhappiness than annexed cities. It makes sense that the city under a puppet regime would be more unhappy than a city that has been properly assimilated into your culture.
that makes more sense to me. How many occupied territories are peaceful and nice?