Yeah I would definitely use distilled water. Plus it will be that much easier to add more...pour in a gallon when it starts getting low and add the uber. Makes for easier measuring.
I can't speak for uber but I know that ONR will not break down in distilled water. It will lose its color but all...