Zoro will kill Kaido (I think in 1061).
But, he'll kill Zombie Kaido, and then we'll spend the rest of the series arguing about how it doesn't count. Hehhhhh...
Oda has never let a villain achieve his dream. Kaido wanted to die a glorious death. Being defeated by Joy Boy fits. In order to ruin Kaido's dream, his death has to be corrupted. Blackbeard and Moria resurrecting him is the most disgusting twisting of Kaido's dream I can imagine.
Get ready for hell, it's coming.