I'd say Jinbei still wins due to experience. Much better at using haki, knows everything about his own capabilities, likely encountered more fighting styles and levels during the years, trained hard from youth to become an expert in martial arts and a soldier in the Kings Guard. Master Karate Champion, Top Soldier, VC of Sun Pirates, Captain of Sun Pirates, Allied Captain of Whitebeard, Drew vs Ace i.e. the PK son who defeated fellow Shichibukai Hanafuda and groomed to be next WB Captain, Shichibukai, Big Mom Allied Captain, Yonko Luffy Commander.
But sooner or later Sanji, 21, will surpass him due to Judges experiments.
It's not like Sanji has ever trained. Not even during the time skip did he train. He is holding back using his hands, essentially handicapping himself. He is holding back himself emotionally. His haki usage has been very weak, only his CoO has been decent at times. His CoA and his body used to be so weak that he always broke bones to the left and right in arc after arc. But not anymore. He got the enhancements now. Enhancements to put him at 90-95 % of Zoro instead of ≈ 55-65 percent like before. So yeah, Jinbei will soon in name and power be #3 Commander of SHP.