I agree there should be another look at the combat mechanics some time, its not bad per se but could be improved considerably, and it may be a good idea as other games show off more deeper combat mechanics.
Like as suggested above, seperate 2 handed vs 1 + shield modes would make a lot of depth.