+ On the other hand, if you're going for the classic 'Castle Keep' feel, I'd add a few more pressure enemies and obvious secrets.
Chaingun snipers could probably be swapped for bigger groups of specters/demons and a few free-range revenants.