Dear Heartbeat:
A suggestion would be to reserve a special jug with the words "Christ Consciousness" on it, and occasionally put your water in it, using it sparingly, so that you can gently increase your tolerance level to the energy. You will probably find this to be quite healing as well.
Over the last while, since I started this experiment, I have found that I've begun to drink more water - instead of constantly just coffee, mostly because the water has tasted so much better, I think. I use the water from the same Brita jug for everything - coffee, tea, cooking with it, and also drinking it.
The other thing I noticed is that I'm not having near the problem of water retention that I was having, and that tells me my kidneys are beginning to clear out. I think the "untreated" water (and the heavy coffee use) previously used were beginning to do some real damage - hopefully that is now being corrected.
Just some thoughts for consideration.... 
Unis