I doubt it. He didn't travel to Wano in order to recover from his injuries and we know that WCI have been attacked by several enemies in that meantime, so he had no time to train.
Well if he fighted thats kind of a training right?
He was actually just getting beaten by many enemies one after another.
Maybe
He did return for One Piece RED
And looked liked he was healed
@Romeo2013 OP Red is filler. Its only canon part is Uta.
What do you think?