I just did the exact upgrade. Well, not so much of an upgrade as a repair since the white oem pump died on me on the road. I put a sureflo something-or-other whatever the parts store had and it does leak a bit. I haven't even replaced the sink which does not have an on-off handle, just the hand pump. You might need something with an off-handle at the faucet in order to make your auto shut-off pump work properly. Without being able to feather the output stream, it's an absolute blast of water coming from the little stock faucet.