They should just increase the amount of time it takes for Abandonment to trigger by a second or two.

I've also gotten killed by latency several times due to a delayed tether.