But thats plot, most fights are influenced by plot, thats so obvious.
You could argue the same things for Zoro vs King at some moments.
King was understimating Zoro by saying "So lets play with swords, i like swords!", so?
Queen attacking himself made no difference at all, it was just for comic relief, since Sanji was going to regenerate due to the Exoskeleton Awakening, and Queen said "Whatever, my choil did the job, you're already dead!"
Queen approaching Some also made no difference, since Queen couldn't detect Sanji at all, but Queen was the one who got detected by Sanji, this a CoO feat regardless of anything you say.
Queen was already done at that moment, Sanji blitzed him before Queen even touches Some, and Sanji's AP was too strong for Queen to recover.
I don't even need to mention Luffy vs Katakuri, right?
Most of these fights against Commanders work like that because Oda wants to show how hard is to beat them, so you need to take every single opportunity you get, and even if you defeat your opponent, he stills being hella strong and unique despite anything else.