I'm sure this won't be the last adjusting. I'm willing to see how it goes, the 8 civ cap feels a little rough.
I would go further to classify "majors" into tiers:
tier 1 (art gallery, jewelry store),
tier 2 (water/islands)
tier 3 (fort knox/NASA)
and maybe make it so each tier has a specific criteria for civ and police alike.