Sanji and Queen have been really impressive, showing off tons of stuff but I wouldn't really place either above Katakuri, especially not Queen. Queen's incredibly versatile but ultimately a lot of his attacks won't land on Kata due to how fast Kata is (competing with and even dodging Snakeman's attacks) and due to his Future Sight. I think Queen would give Katakuri a really tough time but he's not beating Kata in my opinion. Having a lot of different attacks and move doesn't guarantee that they'll be effective or enough to beat you opponent. As for Sanji, he'd give an even better fight and if Sanji really shows off impressive stuff, I'll change my mind, but even now Kata still seems more impressive to me.
As for Diable Jambe getting updated, I hope that's the case and I can't wait for the full summary. Chapter sounds great. Whether it's the updated version or not, Demon Wind sounds cool. I'm content for the most part with what Sanji has done but I'm hoping he shows off his Obsevation haki soon and improves on that.