I'd agree that zoro finally surpassed jinbe but it would be zoros most difficult fight against a fishman, in the water I would still say there's a good chance that jinbe would win because he's more
Cool, calm, and collected than all the others that zoro has fought underwater. Sanji will still get stronger before eos whereas jinbe is old enough that he won't be getting stronger well just see his full potential in the final saga because he hasn't had the opportunity to go all out in the water yet. What he did to the ships when he showed up to wano was comparable to zoro chopping the cliff when he was first getting used to enma, nowhere near full potential.