I can see Kaido being cut down by Zoro above the Flower Capital as a Ryuuma parallel and he falls into Mount Fuji. Then the final with Luffy and Kaido takes place on Mount Fuji which takes up rest of the night.
Marco: Houou In! (Phoenix Brand!)
Queen: It hurts, damnit! A shock wave huh...!!
Marco: Aren't you fighting me?
Marco: If you want to touch those samurais you'll have to take my head first!!!