Hi, I was just starting this discussion and I wanted to give my idea.
I personally think One-Handed/Two-Handed would work better, it always made less sense to me to separate weapons for type, also since the combat system is not based on chops/slashs/thrusts, the only real difference between types is speed/damage ratio.
I also think is more specializated having a separate skill for maces, daggers... and one for claymores, spears... since there are more significant differences between one-handed and two-handed weapons than between two types of eg: one-handed weapons.
What do you think?

Sorry
Sorry