My Pinot doesn't like her water to stay in her dish; well, to put it another way, she doesn't like her dish to stay where it belongs. She has a dual food/ water dish. When she eats, she bats the dish to knock water into the food, then when she's done, she bats the dish around the room. I bought one of those mats that keep the dish in place, and has a lip to keep the water in, but she can get the dish over that lip.

I do have a separate water only dish in the kitchen (she's fed on the lower level, separate floors), which she tends to leave where it belongs, and usually only uses that one for drinking. Maybe you could put a water dish somewhere separate away from the food? It worked for Pinot.