So it’s basically confirmed by Kaido that Zoro has latent CoC that not even he is aware of. Zoro will certainly be back for Round 2, Kaido will have plenty of alone time with Luffy to consider the similarities between Zoro and Oden.
There’s no way this is Zoro’s or Law’s last hurrah, Law has been masterminding this plan since Punk Hazard and Zoro hasn’t unleashed Enma. He will show Kaido that a samurai even greater than Oden is going to lead the next generation in Wano.