Fluids - really worried

I'm 14 months out from RNY, and I can't handle regular water either.  It has to be room temperature or warm, and I like sugar free sweetened iced tee, or liquid water enhancers.  I can't use the powdered Crystal Light because it gives me nasty heartburn, but the liquid enhancer works well for me.  

I also drink a lot of coffee with sugar free coffeemate creamer in it.  I probably don't drink nearly enough, but I push as well as I can. 

I had trouble drinking the first month. If I drank something cool or cold it didn't feel right.  During that time my stomach also was unsettled with plain water.  I used to take a bottle of water flavoring with me everywhere.  Both issues settled over time, until then I drank warm tea, warm lemon water, warmabout anything.  However I kept drinking room temp water such as right before bed and it eventually wasn't an issue.