Water is Water, Air is Air, Fire is Fire, Earth is Earth, Spirit is Spirit - neither good nor bad, those are qualifiers *we* label them with. THEY simply ARE. We create our own realities (which is the basis behind what you're working.)
I hope this doesn't sound sarcastic, because it's not, but have you tried apologizing and giving something back? You were doing a ritual and got thirsty. One of our interactions with Water _is_ to drink, perfectly natural. Therefore drinking, even ritual water, isn't "taking" anything from Water and does not upset the natural balance. *WE* can upset the natural balance by what we think, what we believe, what we create in our lives.
The whole point of doing that form of ritual is to alter or bend or persuade reality to your will, right? If it still bothers you, if you still feel the energy residue, then create a ritual of apology. Talk directly to Water just like you would your friend and apologize. Sympathetic vibrational energies appropriate for such a apology ritual would be a full moon, silver, catnip, gardenia, thyme, vanilla, violet, sea shells, etc. Perhaps go down by a creek or river or pond and sprinkle some of the previously listed items over the water as you apologize. Remember, the key is in *you* and what *you* believe, the rest is just window dressing.
Ritual helps us to focus, but the real power is within US, not within the ritual or the ritual items. Alter your view of the reality of the situation and the situation will change. That is the basis behind working rituals, after all the mystery has been stripped away, the greater mystery that *we* create our own reality remains.
However, because you *do* feel the energies as "scary water', you may want to study and work a LOT more with Elementals before trying to incorporate their energies into your rituals. Energy operates on many levels and the levels that many relate the label "Elementals" with can be VERY powerful (think of hurricanes, tornadoes, forest fires, earthquakes) and should be respected. After all, you wouldn't go barehanded and stick a key into a wall outlet, would you? No, because you've learned enough about electricity to have a healthy respect for what it can do. Same idea. =)
Good Luck and Blessed Be.