You're right, Niko. I'll probably combine Armory & Keep into a "Choose one" card called "Armored Keep," as many factions benefit a lot from one but not the other.
"Extensive Preparation" is going in the right direction, but as written the only use I really see is to ensure that the cards you draw are balanced between reds & blues.
Maybe a way to modify it to superchange your command deck a little bit would be in order, such as ...
Extensive Preparation: Each player pulls up to 10 cards out of his command deck before shuffling; these cards are unused this game.