Choreography was fine yeah it wasn't the best but I don't think it was that bad either, the only time Queen looked like a buffoon was when he accidentally fired those missiles at himself but other than that I had no problem with Queen during his fight against Sanji.
I already know you don't like the fight but I personally enjoyed the fight, and my opinion on the fight won't change but hey you may never know in the future lol.
People say that Haki is necesarry, because of Logias, but at that point Oda could just say "actually if you are really skilled and fast/strong, you can attack the real body anyways!"
Would that be a retcon? yeah, but Haki is one anyways