Youve got nice points
but i think you forgot luffy is now a man that has FS and AdvCoA
For Doffy for example, Luffy's G2 red hawk was able to significantly damaged Doffy. Imagine now Luffy's G2 red hawk and AdvCoA, it would surely be a devastating attack to the likes of Doffy. And luffy could also use FS comfortably now, and his speed is also noteworthy. Doffy has no chance against current luffy in my eyes. Doffy may have better movement speed, but in other classes, luffy supasses it all, let it be in offensive, defensive, endurance, etc.
As for Cracker, current luffy can now no-sell cracker's biscuits as he can now bypass them using AdvCoA. Cracker may have good attack speed, but his movement speed is meh, pretty sure current G2 can blitz him
As for Katakuri, kata outclassed luffy in all aspects bar endurance. Luffy took many hits from Kata and was still able to fight. On the other hand, as far as i can recall, Kata only got a few hits and he was taken down for good. Luffy with FS and AdvCoA now can handle Katakuri in a 1v1, Luffy's endurance already above average of YCs
I dont think there are much of a difference between SC and Calamities, so if current luffy can beat Kata and cracker in 1 on 1, luffy can also logically do the same to Calamitites. On top of that, i dont see King and Queen being faster than Kata, they probably rely more on Strength, and if King and Queen has no answer to Luffy's snakeman and FS and AdvCoa, then it would be a guaranteed lose for them