What if you just made an object for the water, say a tube with some slight wavy in it, smaller at one end than the other and animate just the material you place on it?  It could be a glass/ water material with some bump or whatever. Then just use 'velocity of material origin'.