If you told me back then...that Kid would be elsewhere with Law trying to hold off Big Mom from causing a disaster, while Luffy is hogging all the glory and recognition fighting Kaido, and announced throughout Onigashima, I might've side eye you.
Kid we're talking about, only thing came out his mouth, from udon, to sailing to Onigashima, to fighting his way to the roof, was how he will take revenge on Kaido, and take the glory for himself, damned anyone else.
Maybe his character developed after he saw Zoro block hakai, but I really think for his story to make sense in Wano, he has to fight Kaido again, him and Killer. And for Oden prophecy to make sense.