I used my points in 2-H and kept Damage and Accuracy even. Nothing in the critical hits or death blow until very late in the game.
For the SHaman make sure you are not using a Shadow Sword, it will do almost no damage. Try a regular sharpened sword or Axe.