True, tho I feel he might request a break to stay back with giants, maybe even with RH Pirates to get back in the final fight kinda like Jinbe was in the back to let SHs escape WHI.
Imagine.
They are in the middle of the fight and when something is coming for one of the SHs something shots down the thing and no one knows what happened and don't see from where it comes and there is just Luffy's smile surprised that others didn't knew who could do that.