Oda has his sights on the future fights for Luffy like the admirals that's why he is taking so many losses against Kaido despite all his PU.
He overhyped Kaido to the moon as well he felt he couldn't make this too easy, i wonder if Oda could redo Kaido introduction would he make same choices