Would be surprising if we are headed to another full fledged clash right after Wano. But on the other hand it makes more sense foe more battles, it's supposed to be endgame
100 Marine battleships, Kizaru, Saturn if he's strong or at least command the 4 Seraphims, York who might help them too with tech possibly, then we have Straw hats. What if Seraphims grow after they get "beaten up", York repairs them and speeds up their growth rate from their battle experience they had against now some of the strongest pirates alive.
A lot of factors from an overall first thought "short arc"