If I was Oda I would have given settled Luffy’s powerups to only AdCoA and devil fruit mastery pre-awakening(basically I will make it so that Luffy will be able to stretch/inflate/deflate his body almost instantly on will without the need of applying any kind of force/blowing air where the length/volume of stretching/expansion is dependent on the strength applied/air blown into the muscles and bones and he can keep the specific part inflated without the need of constant haki infusion basically eliminating G4th time limit as well as eliminating G3’s limitations of being slow and the size being limited by Luffy’s exhaled air blown into the bones also I will make Luffy able to vulcanize his rubber body for extra defensive purposes as if he’s using a Tekkai like move against slashing techniques) and only hint at Luffy’s awakening at the end of the fight where Luffy achieves only the paramecia aspect of the awakening of making his surroundings into rubber(not people) and being able to make himself into liquid natural form of rubber so that he can use the awakening similar to Katakuri and only hint into AdCoC by revealing that Kaido has and is using it but not straight up give it to Luffy this arc and make it into a 5 vs 1 fight of Luffy, Law, Zoro, Killer and Kidd fight Kaido and all of them can use Ryou
.
