I personally think Zoro will fight Kaido again. Marco is fine against King, he has no reason to change. Also, I don't believe Yamato can hold out until Luffy's return, for that she would need to be stronger than him. Finally, we have two interesting phrases in chapters 993 and 997 that together make me think that Zoro will fight Kaido again. Kaido saying there will never be another samurai like Oden and Zoro claiming to be there to cut Kaido.