I can't see him "one shotting" a giant octopus under water. He's still weak to water, as far as we know.
By the way, that was kind of BS. Luffy struggled to reach his arms out into the water to bring back Sanji, yet he seemed to have no trouble reaching his arms out into the white-white sea to rescue Ussopp back when they were heading to Skypeia.