You know fighting the second strongest and all the other tropes Oda does.
Not really a plot line but more of a trope Oda does every arc.
What do you think will happen?
Zoro already targeted Kaido , it's pointless to Fight someone much Weaker than Kaido now
So this Break Time for Zoro should be used to progress his Wano Plot Drama Wise, not Fighting Wise
Imo, his Sub-Plot now should focus on him meeting Hiyori & Orochi/Fuku & also thinking about what Kaido said about CoC
I also believe Yamato & Momo will get to the Roof & Zoro/Hiyori too right afterward
I also think Orochi & Kaido should be Dealt with at same time & near each other
So while Luffy is Fighting Kaido, we should have Sub-Plot of Yamato/Momo & Zoro/Hiyori who will go to the Roof once Luffy v Kaido is near it's conclusion. Yamato & Momo will focus on Story Reveals related to Kaido & his Race & Onigashima while Zoro & Hiyori will focus on Story Reveals related to Samurai & Wano in general.
At the End, i believe we will have:
Yamato vs Kaido Moment, Momo vs Kaido Moment, Luffy Victory Moment & also ZKK
While at same time, we will have Yamato (In name of Oden) finishing off Orochi, Hiyori repeating her Mother's Words, Hiyori meeting Momo after Kaido/Orochi are finally down ... etc