The easiest fix is probably to prioritize carriers over cities for aircraft placement.
This seems to be another clever solution!
Replacing the actual leader names by era would be more complicated since it would be necessary to replace their genders too.
Yes I mean the leader names of a civ. Civ 3 with its 4 different era leader graphics slots is suited very well to assign four different leaders during a game to each civ. I wrote a tutorial about it some years ago, that can be found here:
https://forums.civfanatics.com/threads/the-multiple-leader-system-of-ccm.543630/
Now, with all the great new options in your mod, that even SWs can provide special buildings to a civ and additional virtual resource yields can be given to a civ, this allows to give at least some of these different leaders of a civ a different personality. Per example Napoleon in his era can provide a civ like France other bonuses than Vercingetorix in era 1 can give to Gaul.
In my oldest attempts I used the title and leader name entries of the editor to write in 3 different leader names of a civ as can be seen in a screenshot in that tutorial. The space available by using the title and leadername slots was limited by the number of letters that were allowed to write into those slots. The optical appearance in the diplomacy screen was mediocre and even this appearance sometimes could only be achieved by some tricks like setting points between parts of the name. The main problem was, that in diplomacy texts all those names were listed one after the other in diplomatic talks.
Later I named all 4 different leaders in a game ruler. This shortened the text in diplomatic talks massively, but it caused some other problems, per example when the original diplomacy text would have been "Bismarck, ruler of the Germans" a text "I, Ruler, ruler of the Germans" would sound somewhat strange. So I cut out for CCM all diplomacy texts, that could cause such a problem.
As an election ruler against ruler would have caused some irritation whom to elect, I later in CCM entered abreviations of a civ behind the word ruler, per example Ruler (Sp) for the Spanish rulers, and so on, so the diplomatic victory could have been reintroduced to that mod again, as now the vote would be bewteen individualised leaders again, per example Ruler (Sp) vs. Ruler (UK).
With the different ruler names for the different rulers in the four eras of a civ game the original diplomacy texts could be reactivated, so per example in era 1 the text in the diplomacy talk would be "I, Barbarossa, Ruler of the Germans, greet you and in era 2 the text would be "I, Frederik the II., Ruler of the Germans..." and so on.
The problem with different genders in those texts for me was no problem (at least as far as I remember), as the diplomacy texts seem to avoid this problem.