I'm pretty torn about this issue.
On the one hand, a scene like @Ivotas described would be cool as hell, with Sanji himself finding a way around his weakness.
On the other hand, I think Sanji's vulnerability concerning women is a more valuable asset for Oda to create interesting setups and solutions. If I think back, I can only remember Kalifa and Black Maria as bigger villains that Sanji was put up against (Viola was more easily dealt with for story purposes), so it is not exactly overused. And both encounters were solved in a way that uplifted other crew members. In a way, Sanji can be just as weak and needful of protection as Usopp or Nami are, while at the same time, he can take down pirates of Queen's caliber. I, myself, find that an interesting spectrum.
It's not ideal though, that the indicator whether Sanji is a protector or in need of protection is the sex/gender of his opponent. This will obviously continue to create conflict in the community.