okay, i sooooooooo totally get what you are saying here!
Soda (especially a certain brand/flavor that I will not mention as I'm trying to get away from it) is my weakness....... my kryptonite .
Um I don't mind water, and I am getting better about drinking it. I try to push myself or rather trick myself into a little more each day, and I do feel better when I drink more water than anything else. But yes, at times it can be boring.
Okay, just looked at the bottle in my hands. NO CAFFEINE. So if it is flavor you are looking for then maybe try some of these.