I don't understand how orochi's death has an incidence on zoro's final fight in wano. Isn't he supposed to fight King?
Anyway, I have to admit, Luffy and Zoro vs Kaido is actually the only tag team I'd be ok with. I don't want to see Law or Kidd involved in Luffy's fight, they are going to get in his way or they would need to be saved (like Law during the Doffy fight).
I just hope if it happened that zoro and luffy would first have a 1v1 against a decent opponent that they would trash.