What made Cracker and Katakuri so difficult for Luffy was the fact that he had to find a workaround for their gimmicks.
Zoro has already been given a workaround for King's gimmick, by copying Kinemons Fire cutting style. That alone gives Zoro an advantage going into the King fight, that Luffy didn't have going into the Cracker and Katakuri fight.
And I guarantee you the raid suit will play a role in getting past Queens gimmicks for Sanji.