When you go 4S, I'm thinking you will need to change props. I'm trying to recall the rule of thumb from Flite Test, but I think you will have to go down in size (diameter) of prop?
The limiting factors there are max amps on motor and max amps on ESC.