How does that involve Queen though? And why does the raid need to fail for that to happen? And I would say it did get resolved after it was revealed that Queen was the one to hit the woman and not Sanji. Look at how Oda ties in the main theme of Sanji's flashback with the end of this fight.
Not to mention that you can see that his eyebrow turned back into normal after the fight.
So even if somehow the Evil Sanji plotline comes through that doesn't require Queen or the Beast Pirates to be involved in any way.