yes necessarily
op ain't some outlier to shonen tropes. It follows a strict path. Raftel comes before the war against WG as was said by WB. And as is evident by Simple logic too. The WG war will be the ultimate storyline in the series.
What does this have to do with what i said?
I said Mary Geoise gonna mirror Enies Lobby, i didn't say WG's Story is gonna be Over there
They can still face WG again in a different Location in an even bigger War. (Similar to how Luffy declared War against them in Enies Lobby & then We also had Marineford War)
I don't know if you noticed but Egghead Arc was also a WG War Arc, so there can be multiple ones.
And just because They go to their HQ, doesn't matter their Story ends there, and Big Mom is Proof as Totto Land wasn't where She fell
You're just assuming that because i said "Mary Geoise Arc" then it automatically translates to Ultimate End War.