I disagree heavy.
Zoro getting opponents of a lesser class than Luffy's is mitigated by the fact that he tends to have a much easier time and/or much less help than Luffy does. That, plus Mihawk being his future opponent carried the notion of Zoro being one of the strongest characters EoS and close to Luffy.
I'd bet on the fight with Imu or whatever primordial demon being a gigantic group fight and not a straight 1v1 if the mural is accurate. And I don't foresee any of Luffy's other future opponents being in a class utterly above Mihawk
I'm gonna spam the panel