We still not have seen how Queen will perform. I think he obviously has not shown everything he got like King. So There will be a moment where Sanji will be in disadvantage and he will use the Raid Suit.
Queen proclaimed that the All stars are known for their durability and indomitable endurance..

so yea i expect versatility from his arsenal but the integral aspect of him as a combatant should be his durability
Torture and PRESUMABLY kill them in front of him.

My theory: the Scabbards will somehow (Law?) replace them and die instead.

This fits perfectly with the Kabuki concept of Migawari, that is body substitution, in which a Samurai will sacrifice himself at the end of act 3, the main tragedy of the act.
So you think luffy will lose again? I respect ur opinion bro very interesting take