This is maybe too much of an overhaul, but here's what I'd like to see:
* At some point - after a few civs have ideologies, most likely, but long before a cultural victory is on the table - all of the city-states adopt ideologies. They try to adopt the ideology of their ally if possible, but...