How about re-implementing targetting to be--the person you last hit with melee is targetted for 30 seconds, unless you hit another person?
You obviously wouldn't need the target to swoop, however, it would let you know who you were fighting, and perhaps cut down on teaming up--because people...