How about we just reverse the current system? Instead of whoever has more ki we make it whoever has less. Here's my reasoning:
Less ki = more vulnarable. Swooping takes a lot of ki. So does teleporting. Melee in general sucks up all of your energy. The less you have going into a fight the more dangerous things are. You're more likely to run out of ki and fall or be unable to avoid being hit by the other guy, it's harder to mix in beams for the same reason, and swooping drains ki faster than anything. Right now people just want to stay at max ki full time, so there's a whole lot of flying away, charging up, and waiting for your opponent to attack. If you reversed the ki thing, the only way you could take advantage of head ons would be by teleporting at your enemy before you swooped, but since most people on the offensive end of these conflicts teleport before they swoop anyway it wouldn't be as easy to abuse as many people might suspect. It certainly wouldn't be as easy to abuse as the current system, since having more ki than your opponent gives you the advantage of endurance *and* priority, whereas having *less* ki than your opponent gives you some serious disadvantages, particularly if you miss and have to teleport away or try to escape.
Just a thought to chew on.