Right now the combat system is very simple, you have a bunch of skills with X chance of hitting for X-X damage, chance of hitting is lowered by shields and skills, and the damage is lowered by armor.
I suggest that combat be linked to stamina, with each move or block taking a bit of stamina and get worse as you have less stamina to use.
Also either damage needs to be lowered, or health raised so combat takes longer than 1 hit between a mid level guy and a top tier guy so that stamina and actual moves can factor into combat.
Dodging and use of a shield will only apply to the first attacker also.
Prevent using tea in combat
What this means is a top tier attacker will take down anyone 1V1 every time but will start to struggle once there are larger numbers on the otherside as their stamina runs low.