I don't think 2h damage needs to be nerfed. It should hit like a truck. In DOS1 warriors were slow and useless once you blew your battering ram. My mage did like 90% of the damage in my playthrough. Especially since it's already been noted that magic has a ton of variety while man at arms has like none. The skillset doesn't need to suck on top of everything else.
But I agree about the skills. I don't think melee aoes should hit as hard or harder than a single precise strike. Also, rage synergizes a bit too well with executioner, since it takes 2 ap to attack and you get two ap from a kill. Can easily faceroll the entire enemy squad by yourself with it.