A concise version is indeed better because it contains no less meaning than the original.
No, canceling it isn't simpler or more logical. I don't understand why this is even necessary. Moreover, all of this already exists in the game. The same two buildings, the ability to change upgrades, and the option to take two upgrades into the army. Unless you want to artificially limit yourself in possibilities? Furthermore, returning to the topic of logic, the concept of a building with an extension seems much more viable than half a dozen duplicated buildings huddled together in different corners of the screen.
And finally, why limit the kids who obsess over the number of races and units, who have already shown themselves after the release of the third game in the series?