Yes you should cut out all pop, including diet. Diet pop has artificial sweeteners and other chemicals. It technically makes your body think you're still ingesting sugar, so your body reacts accordingly.
I recommend trying different types of teas, they're are a lot of tasty options. I like honey tea myself.