Exactly. Civ VI in City States is trying to cover with a single mechanic a wide range of potential cultures/polities, and it needs to 'expand' the City State concept to match. I could see, for instance, every City State getting some kind of Unique: Unique Units from Military City States, Religious, Cultural, Trade, Financial or even Tourism bonuses from other types. As posted, they already 'dipped their (Designer) toes in this' with some of the City States, they should go All In. Finland specifically could be a Military City State with a specialized recon unit of sniper/submachinegunner on skis, or a Cultural City State providing extra Culture from Forests (wood architecture/furniture design) or even a Resource City State (representing the extreme importance attached to the Petsamo nickel mines in World War Two). Most of the current City States could get similar 'alternatives'. Add some more extended Diplomatic Options with City States, and I think it would vastly enhance the game.