Heroes 5.5 WarGame Edition - Tactical Edition.

Here is another castle layout scheme (all upgrades are collapsed into the same square):

It is significantly simpler than the current one, but the question is whether it is better.