He is fine, he was just dumbed down by plot... Cant let Law do the MC's job. His performance in Wano should be significantly better than in DR.
Well I think he relies on hax too much, he never trained properly. He should get a lesson or two from the Grandmaster Zoro. :P