After Luffy only getting 3 billion I’m going to alter my powerscaling and say that first of all there’s no such thing as Yonko level or Admiral level, it’s called being a top tier which encompasses all great pirates, Admirals and individuals like Mihawk and Rayleigh; right now Luffy is a top tier but that doesn’t mean he can defeat every top tier there is.
Luffy’s power scaling should be Base Luffy(G2/3/4) and Gear 5th Luffy. Base Luffy(2/3/4) is top tier but barely and when he uses Gear 5th he is at the same level as other Bonfide top tiers