I wouldn't be surprised if he did tbh.
Nah that isn't how Oda does it. Here is what will happen:
- Flashback ends, everybody has sympathy for Law and Rocinante and the good cause
- Things will take a turn for the worse
- Oda sets up all the fights right till the point where they're about to be decided in favor of the baddies.
- Every Strawhat will get 1 chapter, with title that references to the battle to finish the enemy off.
- Luffy is the last on to beat the enemy while his tired nakama look look proud and the kingdom cheers.
Of course there will be little twists left and right but this is almost a 5 step golden rule for when the fighting starts.