I agree 100%. I suggest adding Panic and removing Balance or Mininostalgia.
In this tournament, it's always advantageous to play as Castle because you can eliminate Smite and Balance and play with any of the three remaining templates, always choosing one of the strongest castles.)
Moreover, this set is classic; personally, when I play as Dungeon, I immediately remove Balance and Smite.