I've had at least 5-6 games so far where we're at the payload having more than enough waves to win and time ends. It doesn't make sense.

Make some timer to start at 0-0 waves maybe? I don't know what approach would be best but for sure atm isn't right.