When? Don't forget the emotional drama inside him is his own fault and not really related to powerlevels. Also, believable he would, though not anytime soon. Sanji prior to the power-up shouldn't be able to beat the Franky Shogun if we are realistic.
Which speaks for itself on how weak Queen is within his respective tier. The deadliness comes from the plagues, a power that clearly exists in-universe and that should have inflated his bounty close to King's as it can wipe out, actually it can wipe out all of humanity and everyone right now got a glimpse of it, but a power that can never be used in Shonen combat unless the enemy is a doctor, as such we cannot really use it in our arguments.
And I know this is going to explode now, but for an entire DECADE the ENTIRE community was whining about Sanji and how we weak he his and disappointing and blah blah blah. And power-wise, that's pretty true prior to the power-up, which is drastical and one of the largest power-ups we have ever seen in the series (the other large ones would be Nami's first climate tact and receiving Zeus).
What people need to keep in mind is the progression of the series:
Jinbe is a 46 year old veteran and former Shishibukai from the post-Roger era, the "Era Whitebeard". He has not shown his full potential yet. He is tertiary in relevancy among the Straw Hats and as such is unlikely to get more fights than Sanji, and without any narrative need and the current potential unknown very unlikely to get any power-up. He will simply reveal his remaining ultimate abilities and that's it.
Sanji on the other hand is a 21 year old rookie from the current era (Luffy's era). He also has not shown his current potential either. He is primary in relevancy among the Straw Hats, and arguably no other Straw Hat has lead more sideline plots than him, and as such is highly likely to get more than one fight given how many antagonist groups there are remaining. The way it looks like, with the "Wings of the Pirate King" thing, he is pretty guaranteed to kick either Kizarus's or Ryukugyu's ass, on top of an opponent from the Blackbeard Pirates. This is Shonen and Sanji is a character meant for the readers to identify with, also we don't even know what exactly happened with him. Sanji will get another power-up and possibly even more (hello CoC), that's for sure.
I think the assumption Jinbe could not beat Queen is a result from inflating Sanji without any actual need for it. Sanji is a progressing character and an arc later everyone here will never talk about Queen again. Jinbe is a frozen character, he did not power-up after two years and will not power-up again. If anyone wants to give him at least some decency, Queen should be a piece of cake for him.
Throughout the entire first half of the fight, Sanji struggled to put lasting damage on Queen, not to mention that SANJI GETS ALMOST EVERY BONE IN HIS BODY SHATTERED. If it weren't for Germa regen, he would have lost. As the internal conflict that started after the power-up, Sanji at that point would have already lost, med-dif at best. As for the bolded, this is only realistic if you're reading Two Piece.
That's not an indictment on Queen; it's just wild headcanon. The notion that Queen's plague is the bulk of his strength is laughable at best. The plagues are just nasty experiments that can only directly work on fodder. No single plague is effective in a one on one fight against anyone of significant strength.
No Sanji has got slandered for years, most in the Sanji vs Zoro debates, his feats were somewhat underwhelming, but he always had portrayal on his side. It has been constantly reminded that Sanji was a powerful character still seen as Zoro's rival and a part of the monster trio. The only complaint was that Zoro and Luffy had received more love than Sanji in terms of combat, which was true. Anyone doubting Sanji's hierarchy in the crew was an idiot.
Sanji and Jinbei's plot relevancy is not as relevant to them fighting as you make it out to be. Despite everything you named for Sanji, his fight with Queen is his first full-on one-on-one fight since 2007. And no, I'm not inflating Sanji. Jinbei has zero feats and PORTRAYAL, implying he's above Sanji, even before the power-up. You mention the lack of fights Jinbei has, but narratively nothing puts him on Sanji and Zoro's level. Queen flat out calls Sanji and Zoro the third and second strongest Straw Hats; even if you want to say Queen didn't know about Jinbei joining (which I still don't respect, look at the author's intent with that statement), look at who everyone fought. For years, Oda showed the crew's strength hierarchy through who they fought and beat. Sanji and Zoro fought two All-Stars, the strongest two, yet Jinbei? He was delegated to a Flying Six member. It's crazy because Oda wanted to he could have had the third All-Star; Jack fight Jinbei but didn't. The writing is clearly on the wall.
Jinbei, at the end of the day, has been someone portrayed as strong, even by New World standards, but the problem is that it's too vague. Someone being strong in the New World could range from Vergo, to Doflamingo to an Admiral. Jinbei, by no standards, has the feats or portrayal to beat Queen, let alone with the ease your post implied.