Personally no, but that's because I believe Oda will 100% paint Luffy as the arc savior God as he always does.
I personally would love to see the Ryuuma parallel, I just don't expect it. Same way Law was barely instrumental to Doflamingo's defeat and it became very Luffy centric, or how Sanji received zero fights at WCI while Luffy defeated 2 YCs.
At the end of the day he will not shaft Luffy's focus, that's just what I personally believe. For the record, Zoro is my favorite character like many others here, I just don't have a bias towards what he receives vs other crew members. Clearly there are "instances" where that does apply (such as Zoro sacrificing himself for Luffy to Kuma or his vs 100 bounty hunters moment or vs Mihawk), but overall it's extremely rare and never involves the main villain.
That's why i still have my theory that i will die upon.
Because there was a main villain that Zoro did defeat, gave the last hit, and that was Captain Morgans, during Zoro's introduction "arc".
Luffy beat the shit out of Captain Morgans, but Helmeppo took Koby as hostage and used a threat to make Luffy stop hitting Captain Morgans. Then, when Luffy turned to Helmeppo and decided to attack him and save Koby, Captain Morgans used the opening to attack Luffy from behind.
Do you know what this reminds us? Yeah, that's right, Oden getting tricked against Kaido.
But the problem then was that Oden used to do things alone, all by himself, that was his biggest flaw. While Luffy has no problem asking for help and letting his crewmates do what needs to be done.
So, against Captain Morgans, Luffy trusted Zoro to defeat the Captain while he was focused on defeating Helmeppo.
I think the same thing could happen in Wano.
Someone uses Yamato / Momo / Tama as a hostage when Luffy is beating Kaido, Luffy stops beating Kaido to go help the hostage, and then Kaido uses the opening to defeat Luffy, just like he did with Oden. But this time, Zoro will be there, and deliver the final hit to Kaido. Making a perfect circle from his introduction arc and his New World arc. Also concluding the Ryuma parallels and lettting Luffy overpower Kaido by himself.
Both ZKK can happen and Luffy gets to defeat the villain.
I've been saying it for months now.