Once bees get on a water source, it's hard to get them off of it. I use a chicken waterer near the hives. Sometimes they use it, sometimes not. They like my bird bath around the back of the house. My neighbor has a big, beautiful pool and no complaints yet. Try to give them an alternative. As far as not moving the queen, the best way is to find and isolate her when you move the frames. If not, you can shake the bees off, leaving as few as possible. I don't like brushing them.
"My wife always wanted girls. Just not thousands and thousands of them......"