Good for you for wanting to kick the diet soda habit. More and more research is pointing to its (big) role in weight gain. Here's what I suggest:
Squeeze half of a lemon into a glass of seltzer water (not tonic water as it has lots of sugar). If you need to sweeten, use natural stevia
And slowly, you can even cut back on the stevia as you get used to not having sweet drinks.