The issue with Zoro vs Kizaru is that at no point did the story make Zoro's loss at Shabondy seem like a loss that Zoro needs to get revenge for. In fact it was the opossite. Kizaru acknowledged that Zoro was exhausted before he arrived, there is no disrespect or humiliation going on here.
It was Luffy who stated that they need to surpass Kizaru, Kuma and Sentoumaru after their loss to them. The only guy among those three that's still an enemy and coincidentally the strongest out of the three is Kizaru.
And the first second Luffy met Kizaru he immediately brought up that they have indeed grown meaning Oda didn't forget about the panel above, the proving that they surpassed Kizaru and co part I mean.
It is totally alright to want Zoro to fight Kizaru for hype purposes but to say there is any narrative built up for this matchup is just not true tbh.
Kizaru using his blade is as much confirmation that he fights Zoro as it is that he fights Shanks or any other swordsman for that matter. The fact that he casually uses it against pretty much everyone actually isn't good because it doesn't seem the sword is his main fighting style.
Just my two cents