I don't think it needs changed at all, It's not really a big issue. You can easily switch teams back if you have both registered as lineups, it's not very hard to do. If anything, just leave the nine tails fight early. Like Shadoblaze said, the later rounds can take a lot longer, and if it starts later, people are less likely to be able to do every fight required if people stall out the timer.