Here's an idea: Drop Daze for a magi-saber spell, revise apprentices with hoplite-quality training. 18 > 21 training points won't hurt the apprentices much.
We could go for Magic Fighters... Spellswords? Battlemagi?...
If we do that, maybe focus their magical education solely onto enchantment, to save on training costs.
After all, those would likely be a few of the most relevant spells for someone that's fighting in the thick of things, is it not? (Nevermind that it's literally half of our current spell repertoire, I'd rather not have the guy right next to me deploy a point-blank fireball, thank you very much. And even disregarding that, but I'd like our expensive magic melee units being well protected, and a spear stab or sword swing is likely much faster than even a basic attack spell, as these guys won't be master mages.)
Could I suggest a slight alteration of your government plan, Taricus?
In addition to what you have, perhaps have every city state hold a general election (Helots not allowed,
for now....) to elect a single local to the council. Now, to keep the nobles happy, these elected officials will only get one vote, and those chosen by the Aristoi get 2. Our 'king' will of course then have 3 votes, and be selected by Council Vote, which of course the nobles would have a significant advantage for. Another concession will be that only a member of the Aristoi can be nominated to the position, to rest easy any fears of a mere lower class citizen being elevated to a position above them.
TLDR, every major City-State gets 2 officials, one chosen by the local nobility, one by a more general election. Keeps the Aristoi happy by giving them more powerful seats, keeps the lower classes happy by giving them a say in government, even if a minor one. (Also, technically nothing stops an Aristoi being the elected official for a city, if they can win the popular vote, although a clause will be in place stopping one person from holding multiple seats on the Council.)