Nope, this is the kind of thinking which led to ZKK. Oda doesn't stray from his formulas. Queen is a fodder to Kaidou, so it matches up perfectly with Oda.
Luffy has had major battles without Sanji receiving one himself let alone taking out the #3 of an org, see Doflamingo, see Caesar Clown. Luffy has never had a battle where his arc opponent cannot low diff Sanji's opponent.
It ain't happening bro not without you picking option 1 or 2 from my post, sorry to be the bearer of bad news.