It is possible that Luffy falling towards the ocean is fake tension. Personally, I hope he has been defeated for now. I love Luffy, but it seemed like his understanding on how to defeat Kaido came too quickly. I doubt it will happen but Luffy needs to actually understand that the Yonkos aren't some sort of game. They are a serious threat. During the roof top, Luffy didn't care what anyone else was doing. He was off doing his own thing. That is his character but everyone was working well together and if Oda had Luffy solo Kaido at this exact, then the teamwork was pointless. IMO it also shows that if he could solo Kaido, then Luffy doesn't need his crew anymore. He might as well get back into that barrel and find the One Piece on his own.
I hope Act 3 ends and Act 4 will touch upon what is happening outside of Wano. I would like to know what is happening with Sabo and the Revolutionaries. While Oda focuses on them, perhaps there can be a few week time skip. That way Luffy and Zoro can have time to recover and then fight Kaido again. I am wondering if it is possible the Kidd and Law (maybe Killer?) will work together to defeat Big Mom. Luffy learns that he needs his crew to help him defeat Kaido. Then we have all of the SHs confront Kaido, or Oda does round 2 of Luffy and Zoro working together. I think the latter is more likely. Luffy has advCoC that may need to be refined? It is also possible that he will awaken his Devil Fruit during round 2. Then Zoro still needs to turn one of his blades black. We know Zoro has CoC. Yet the execution was underwhelming, so it is possible that Zoro has a second fight with Kaido and there is another definite CoC clash from him?
The downside to that is what happens with Robin, Brook, Franky, and Jinbei? I hope they win their fights because I think it will be too much if everyone from the alliance lost their fights.