Unfortunately not when they'll fight the Admirals. The usual Zoro oponnent > Sanji oponnent ends there. There aren't another group closer in power than the Admirals. That's where Sanji will have well and truly caught up completely.
But then again its a matter of difficulty, utility of powers, and future arcs.