Yeah, the combat really does need a tweak, however, I think I would rather add a mechanic that encourages combat instead of forcing players to fight. (Such as health drops)
