One thing that people are forgetting about the sabaody parallels is that they were initially meant to go straight to fishman island prior to kizaru mogging everyone so i still think elbaf won't happen now.
Emerald city where nami awakens her conqueror's haki, elbaf where usopp awakens his conqueror haki and then sanji awakening his conqueror haki with something involving his family ties to willie gallon and the ancient kingdom.
Emerald City, then the false elbaf theory by @Salah WG then true elbaf and a possible travel to the moon prior to lodestar, laugh tale and then the final war.
Emerald city where nami awakens her conqueror's haki, elbaf where usopp awakens his conqueror haki and then sanji awakening his conqueror haki with something involving his family ties to willie gallon and the ancient kingdom.
Emerald City, then the false elbaf theory by @Salah WG then true elbaf and a possible travel to the moon prior to lodestar, laugh tale and then the final war.
That's cuz Koby Sub-Plot was written to be resolved without any SH involvement, on other hand, Luffy is gonna be part of Sabo/Vivi Sub-Plots which are obviously linked to Mary Geoise, so Luffy's Next Destination is Holy Land, not Elbaf
Kizaru Fleet are only added to prevent Rest of SHs from following Luffy, and to also deliver him to Government once He is defeated (Based on Hawkins Prediction), imo Monster Trio aren't going to Elbaf, instead Usopp's Lie from Thriller Bark will come True (When He said Hot Female Sword-Master with Meat, it was a Foreshadowing that Monster Trio are gonna end up by themselves)
It should also be noted that Wano saw Monster Trio get Super Strong, but Rest didn't get much PUs.
So while Monster Trio are having their own Arc, Rest are gonna meet Giants where Usopp will shine without Luffy/Zoro stealing spotlight from him due to having CoC, and They will train & get Stronger thanks to both Vegapunk & Giants