If a character has invested in being very good with a 2 handed battle axe, why punish them repeatedly? One aspect of the game encourages specialization, then another aspect makes that specialization mostly useless.
You can accomplish the goal of shifting the balance of an encounter with the...