Just had a look at my old city plans - I was running the orc chapter with 2 armories. But I only had 3 Rally Points. So there was enough left for upgrading the 15 workshops (which of course took some time, but mainly because of problems with gold, there were enough other buildings requiring my builders - same happens now in chapter 10). I think I had 2 armories in chapter 9, too. Just deleted the second one two or three weeks before.
Regarding workshops: with all the changes to the AWs recently, I think of tearing down a lot of my workshops and replacing them with the new wonders. If the wonders would have been that way in C8/C9, perhaps replacing and reducing the orcs required would have been an option for me in these chapters already.