We could make a simpler system and forget about damage, because let's just say not everyone (if anyone at all) will bother calculating the damage dealt.
Think about how many times you looked in the bestiary to check a monster's HP? 121 times for the entire first part of the RPG. Not counting the times people went there just to browse. :
I think we need to simplify the system. And there's no need to divide weapons into classes. What does it even give us?