Yea if Oda wanna make Luffy win, just give him 1 powerup after the first defeat, the rest is Luffy's unique applications of it and it should be enough to win. Just like revealing Gear 2nd the first time.
The more appropriate question imo should be "should Oda learn more about how to create tension other than make Luffy lose multiple times without real damage"