Although I'm not totally confident about the theory like many others, I think ZKK can still happen keeping all the points this guy gave in the video in mind and Kaido could still get a 'bad' death, one he doesn't want. That would be a 'coward's death'. I can see Luffy's fight parallelling Oden's in the sense that Orochi in place of Higurashi takes someone, for example, Tama as a hostage and comes to the rooftop just after Luffy 'beats' him. He still might want to take this opportunity to gain Kaido's trust. Luffy of course will turn back to save her and Kaido again takes that opportunity and commits the same mistake again, diving in for the kill. But this time, Zoro is there. I think this works because:
1) It's a coward's death for Kaido.
2) Zoro is just protecting his captain like he did a lot of the times throughout the war.
3) Luffy gets his to defeat Kaido and potentially break his will to fight fairly.
Also, he literally ignored the panel where Zoro said that he'll cut Kaido into pieces. That's key evidence for the theory. Although I'm not a full-on 'ZKK believer'. I do think that the theory does have credence.