I find tap water works most of the time, or lemonade. When I was growing up, if the family sat down for supper, or Sunday dinner, plain, unsweetened iced tea was de rigueur. If I'm eating, I'm not really going to relish a soda, like I would on a cleaner palate.
Congratulations on going off soda.
I think you'll enjoy tea quite a bit more, if you learn to enjoy the taste of the tea, sans sweetener. I know I do.