Switch to carbonated water.
I drink carbonated water. Over time the flavored ones taste terrible and phony and the regular plain ones tolerable.