This is a big deal and im sure its being fixed but as a player right now the best way i have found to handle this situation is to simply:
1. Click F5 (this creates an autosave, wait for it to complete the save)
2. Click ESC and load the game from the most recent save point
These two steps seem to fix the combat bug for me every time.