I just want people to know that for me it was only the *possibility* of them fighting. In the end it does seem like Oda will keep the central them of Luffy fighting the #1, Zoro facing the #2, etc, BUT he's already done something massive in that he dedicated an entire plotline to Zoro fighting Kaido and even injuring. I won't even rule out ZKK because honestly who knows what happens at the end of this, but the argument for me was always (at least when it was obvious he was going to the roof) what would happen if Zoro fought Kaido, resolved his enma plotline (at least partially), and then was forced to fight a Calamity?
To me now it seems partially clear that Marco may have only be there to hold off those Calamity fights while the rooftop battle happened. It's also why he's been just making Sanji (unfortunately) do nonchalant shit until seemingly now.
Like to me it seems VERY on the nose that Sanji doesn't have his matchup yet, all while Oda has been trying to progress the rooftop battle to this point and send Zoro (and Law?) back down.
Next step is to see how that dialogue is presented in the chapter.