The game very much needs a 3rd armory slot; particularly with game rebalances requiring us to change troop compostions, which takes a long time. Speed ups do help, and are appreciated, but we're swamped with so many different upgrades in the armory. Maybe a new university leader could be introduced at a certain age that unlocks a 3rd armory slot at the last stage. Otherwise, unlocking with crowns or other means.
In regards to generals, maybe generals could be upgraded in the fort since that's where we already upgrade the commander.
Certainly, there are options to make the armory less of a bottleneck.