Zoro's setup is not wasted, it will lead to him opening Kaido's scar.
That's not something i'm interested in debating right now though, i don't blame anyone who thinks Zoro vs King will not happen at this point. I just stand by it, and once the arc is over we will see wether i was right or wrong