I actually didn't believe Zoro would fight Kaido until about the time he was going to the roof.
In a smaller sense, I recently realized that the Kaido flashback was actually better plotted than I thought.
And I'll take an L if I really feel strongly. So I think it happens