Nah, one of the TTC will have it
Zoro and Sanji vs Shiryu and Diamond Fruit Guy
Zoro will start fighting shiryu but then shiryu will go invisible aka zoro weakness with CoO
Sanji will start fighting burgess but then Diamond Fruit Guy will go diamond aka sanji weakness with sharpness due to mainly being blunt force
Then zoro and sanji will switch sanji will beat shiryu due to him having superior CoO and seeing when hes invisible
and Zoro cutting diamond as foreshadowed in alabasta