I mean, that has no bearing on Zoro actually fighting Kaido again. He already did what he said he was going to do up there: Cut Kaido.
The fact that Luffy already is telling them to leave is telling enough on where Oda is going with this. Its more likely to assume Zoro gets a calamity fight then to think he will show back up to fight Kaido again lol.
Chopper has to fight Queen or Perospero at this point, i think he is going to fight Queen since Brook was the closest one to Pedro and the one who should fight Perospero.
Queen has to fight Drake and probably even Apoo. Drake and Zoro already took Apoo down, he won't be defeated again and he lost the antidote. Queen mentioned Sanji's father because they are both scientists, no need to search for another link.
Sanji has to fight King, their goals are in direct contrast.
Zoro's possible matchups are:
- fighting King alongside Sanji
- fighting Queen with some kind of help (Chopper? Sanji to defeat in a 2 vs 2 King and Queen?) But it would seem weird, he entrusted the live floor to Drake.
- fighting Jack
- fighting WsW without his mask
But i think that since he already had his fight and went all out, he can still do something else but he won't have a solo fight. It is too much at this point.