No it isn't. Zoro will face Mihawk. Buggy is the captain for a reason lol.
I mean, this just proves that by basic logic, CGs primary purpose is to give Mihawk a purpose to be involved in the fight for One Piece. Before this he was minding his own business. Then he lost his Shichibukai position, then Croc offers him co-leader in his Utopia plan. Then this gets overtaken by Buggy's charades.
This is why I doubt CG will be anything but gags, old villain showcases, and setting up Mihawk to be involved in the main fight when Luffy ends up fighting Blackbeard, Shanks and Akainu.
Just how I feel about it