Sounds better. I wanna see some hype moments but Big Mom ultimately crushing them as well.
And as much as Zoro fanboys dream: the Arc is over for Zoro. No, he wont fight King, Marco will. And no Sanji wont fight Queen, X Drake will. Straw Hat and Samurai alliance get shattered. And only with a new force appereaning, like Red Hair Pirates, Blackbeard Pirates or an Admiral, the scales of the war will possibly tip to the other side.
Any other sort of plot armor writing, such as Luffy and Zoro comebacks, Sanji fighting a Calamity. and Nami and Usopp fighting and defeateing Tobi Roppo's, will hopefully never happen, would be staight bs and just a bad way of writing. Preferences aside, be honest!