Well its stated they will split into 2 groups. So im assuming they splitted early and thr second group is meant to infiltrate through Maria's residence. I dont think Sanji will split up from Nami and the SHs. So hes probably gonna lead the second group of Samurai and SHs.
Aa for the gags....anything is better than the nosebleeds. And seeing how sad Sanji was last arc. Im glad hes enjoying himself this arc. However I expect him to act normal when it comes time for the fights. Hopefully seeing BM naked or no women will make him snap back to normal.