Tbh, unlike Egghead and WCI, Elbaph is not "gotta escape" arc, it's more like Wano and Alabasta "gotta save them" arc.
So I believe the SHP and the giants have to overpower HK and Imunko somehow, which means Sanji should get his fight. Now, in a perfect world I see Luffy vs Imunko, Sanji and Zoro vs Sommers and Killingham, Loki vs DR's giants and nightmares. Brook is likely to aid Luffy and make Gunko regain her memories and either become a normal person again or die horribly like Saturn.
But I still give you a benefit of the doubt, Zoro is already fighting the DR'd crowd, Luffy & Loki can kill Sommers easily and move on to Imunko together, and Sanji is still just running around.... which doesn't mean he cannot get into a fight with Killingham, who is also roaming free for now.
So I'm like 95% sure Sanji will get his 1-on-1 this arc, and 5% ready for "bake the cake" and "clash and run" disappointment.