Does Luffy get another power up?

Now that Gear 5 is here, is there any room left for Luffy to grow? Or will his final evolution be purely about mastering Haki to Roger’s level?