Yeah that's what I am thinking. It depends which direction author takes.
Author could make Ryokugyu troublesome for Zoro to deal with too. We know Scabbards can use haki yet Ryokugyu with his environmental control (awakening) allows him to attack from range without worrying about getting cut by haki and has regen, and use his black blade in some weird way with his df, so Zoro would have to worry about multiple abilities.
While Kizaru's speed attacks being countered by Sanji's speed and CoO