What would prevent Kaido from coming back is Luffy being Joy Boy. The scenario of Kaido growing to respect or even support Luffy has been there for years, it's literally one of the most consistent resolutions for his type of character (which isn't new at all).
Unlike what many people believe, he doesn't need to die to be taken out of the picture.
eitherway when Luffy beats the beats the bad guy Oda made something that ensure he doesn't come back to where he was.
He send Buggy flying , and Buggy wanted to taked revenge so he followed Luffy
He defeated Kuro and he just went away.
he defeated Arlong and was captured by the marines and sent to prison
he defeated Crocodile and he was captured by the marines and sent to Impel down
he defeated Bellamy and he turned to a new leaf
he defeated Enel and he went to the moon
he defeated Rob Lucci, and thanks to Spandam the marines went to hunt him and his guys.
he defeated Moria and Absalom took him and flew.
he defeated Hody Jones and thanks to the medicine he turned to an older man who cannot stand.
he defeated Doffy , he was captured by the marines and sent to Impeldown
he defeat Cracker and Katakuri and they just remained in WCI.
what makes people think that Oda will make it different here?
he even has the CP-0 so they could take Kaido to Impel down too.