You're a stronger person than I am. I tried to stop drinking pop and only drink bottled water, even bought myself a water filter for the fridge and still end up drinking pop. Not nearly as much, but I also don't just drink water now either, it was too hard.
It was INCREDIBLY difficult to do. I relapsed and cheated more times than I could count. I had a soda a day at LEAST for 20 years, and 6+ a day for 5 of those years. It was to the point that water was disgusting to me. It made me feel physically ill. I drink nothing but water now ( with flavor squeezes ) and maybe a bottle of Snapple once a week. I'll pop a can when I'm really stressed out or am celebrating something special. If it's something on your "to do" list, I have no doubts you can kick it eventually. Take it slow! I had to ween myself off it slowly over the course of like 2 years. 
I'm surprised the few times you do have it doesn't cause it to burn your mouth. I quit soda last year and after only a month of not having any then having one I couldn't handle the stuff anymore. 
Oooh, no, I've never had that happen.
The exact opposite actually .. it tastes so much better to me now that I have it so infrequently. Every time I have it I am always tempted, "just one more .."