Oda is giving Zoro a surprisingly big amount of screen time in Elbaf. What is he cooking for Woro?
As long as he isn't planning another arc where nothing happens like Egghead where he uses a barehanded fighter like Lucci to stall Zoro, everything can be considered an improvement over that. Best case scenario, Zoro claps Shamrock here while Luffy is busy trying to calm down raging Loki.
He might use some random Holy Knight that will be summoned now to stall Zoro as well but two arcs in a row would be too repetitive.