While that is impressive I guess, Luffy would still have no problem defeating her in base form.
I personally think that he needs G3 at most to defeat her.
Base Form Luffy can defeat Gifters level characters and Below.
G2 Luffy/Red Hawk can defeat Headliners and Low Veteran Level Characters.
G3 Luffy can easily stomp on All Veteran level characters.
G4 Boundman/Snakeman wins over YC level characters mid to high diff.
G5 not revealed yet but it should low-diff YC level characters.