To be honest, it goes past the deadline (sometimes by a lot) every round of these tours.
Maybe a longer period for each round....?
I personally get my battles done asap but, I know most users preffer either taking their time teambuilding or aren't sure of their schedules so they cannot plan ahead..