IMO its 50-50 between Mihawk and Shiryu
That grim ripper option completely caught me offguard

I think Nasujuro is the other candidate for Zoro's final opponent.
Just as Imu can be stronger than Kaido/Whitebeard, Oda could make a Gorosei stronger than Mihawk.