That's X Drake's fight. Whenever it ends it ends, he's not getting anothr 1 vs 1 for this Raid, not even Luffy got multiple 1 vs 1 fights.
It's set in stone. We got build up through the whole arc for that with added clues, and the Raid only went to reinforce this notion by adding past history between Queen and Sanji's family.