I think water level is going to be a problem in those two pieces. If you fill it to the bottom of the pump outlet, I have a feeling you're going to get a drink every time.
Edit - i see you mentioned changing the mouthpiece location, that should fix that issue. Not sure about the rest, but we'll...