I'm glad you were able to confirm it
That body swap part in punk hazard part is the coup de grace I'm talkin about with my friend
My friend already
really dislikes Sanji's gag to the point where he's disappointed in him in his regular heart eyes mode "this is what you're reduced to" is what he usually says. The fight with Mr. 2 was basically ruined for him because of his deal with not attackin a lady.
I am morbidly curious on how he'll react since as you said it's an extremely out-of-character perv moment for Sanji and a bit of a outlier weird moment in general for the series.