We use water as well. Two more points. 5-10mM Tris ph7.5 also worked well (we did not try higher TRIS concentrations or higher pH values). Be carefull regarding the type of your tubes (you use to store the water in). Some plastic material contains fluorescent material (often in softeners) that may influence the probes. It becomes more or less important when you store your water over longer time periods in plastic-ware instead of in glass vials. Short term storage (in our hands) was no problem.
Water is fine, but I think 1xTE buffer would be better. The alkaline solution can protect your probes from degradation. The pH of the probe solution will not affect your PCR reaction, because the PCR buffer plays the key role in pH adjusting in reaction.