The ending of Act 2 was just so perfect in terms of building anticipation, I don't foresee the war taking a break or anything after it starts. The war will probably go all the way after the flashback till the end of the Act.
[automerge]1574527465[/automerge]
To be fair Sanji's origins were foreshadowed heavily since Skypeia.
Zoro had no such connections, so I'm pretty sure they won't pull something like that on us.