honestly i havent read this whole thread, but since you are still looking for help...........

how about some water thingy like the ones used for hamsters and such but big enough for all kitties and dogs............no bowl to tip and no water to spill

tha only problem is where to put it in case that it works for you