Using a Soda Stream home water carbonator helped me to abandon soda entirely and increase my water intake.
I finally broke down and purchased a Soda Stream home carbonator after hearing the Nutrition Diva (podcast) rave about it. It changed my life. It is the one appliance that I will throw in the back of my car on a road trip to bring with me so I can keep drinking water. It carbonates home tap or filtered water. You can add syrups (reg or diet) or flavor essences to your own water
At first I bought flavored diet gingerale or grapefruit juice. Then I graduated to flavor essences, then found I preferred plain carbonated water. After my lap-band surgery, I went back to the diet syrups (they make a mean peach iced tea) without carbonating the water. It's awesome!