Really, its almost like combat should track melee distance - close, short, long.
Close - right in your face - elbows and knees, shield bash, uppercut, maybe a dagger
Short - inside the distance of a spear or two handed sword
Long - not likely to be threatened by a person with a knife or short...