I don't think so tbh. Luffy just this chapter sent Yamato back down because he wants to 1v1 Kaido.
What I do see happening (compete guess):
- Luffy gains the upper hand on Kaido
- Momo saves Onigashima before it lands, moves it to outside the capital
- Kaido regains some of his lost strength from holding the island up, proceeds to overpower Luffy. Prompts Luffy to use new form/moves
Maaaaybe after this point, the BMP (using Hakumai's secret entrance) had been following the island to get to it and join the battle. At this point, I could 100% see Yamato guarding Onigashima from them. Starts out as a hype thing until she's overpowered, but then others like Marco, Izo, Neko, etc all come out to help her. Then strawhats who are fine among other fodder. At that point I could possibly see Yamato fight Smoothie. The rest would be just exposition fights like Marineford.
Idk, still so much going on this arc. Apoo, Hawkins, Fuku and Numbers still need to be dealt with. Orochi does too. Doesn't include CP-0 presence, or the fact that 4 major enemies are still up.
I still think these 4 (Queen, King, BM, and Kaido) are going to last longer than usual. We will continue to see them fight over the course of the next ~10-20 chapters (less so the calamities, more so the Yonko) while all of the above is taken care of first.