My guess is that you have more rpm with the new motor and stock prop and therefore it rolls over from the torque.

Try a smaller prop or use less voltage (less cells).

Are you using 2S or 3S? 4000kv is a bit much for 3S so if you are running 3S try to step down to 2S.