Yeah, imo ZKK was always going to happen AFTER Luffy knocked out Kaido first Then something like tiredness/G5 drawback kicks in so Luffy cant keep fighting and a half-dead Kaido get up trying to destroy the capital. This is where Zoro steps in.
Zoro was never going to outshine Luffy, so the idea Luffy is getting another L again just so Zoro can 1 vs 1 Kaido and take down an emperor while the MC got no win was always fanboys desillusion