Armoury & Library Imbalance

[Endril]

May I suggest that their be a technology to unlock researching 2 different upgrades in the Armoury at once, or to release a different building in which a portion of the upgrades can be moved too. However I feel the second option doesnt feel as elegant. I as a player have already finished all library technologies and my armoury has a very long queue of stuff to do. With the unit upgrades, tactics, generals, factory unit upgrades and soon the airfield unit upgrades the imbalance is becoming more pronounced. If other players could comment on their feeling or possible solutions that would be great.