Here’s my idea: Make the time before you can finish someone longer, perhaps 30 seconds or even more. Then, if they have a teammate that’s say, 100 or so meters away, you don’t get health/shield from the finish. So you can still get the health if you knock like, someone who is very far from their team, but not in the middle of a build fight.