I also had similar problems with my caffeine intake getting higher after I quit alcohol.
I'm a big coffee drinker yet I have learnt if I drink it after lunchtime I will awake half the night! I have switched to de-caff for the evenings when I fancy a cup.
A friend of mine found the caffeine made him so anxious that he now only drinks decaf as a rule, that's t-bags and coffee!
As far as carbonated sugary drinks are concerned they are not healthy no matter which brand you consume.
Drinks lots of these types of drinks can cause problems that can be very difficult to control.
The best way to control cravings from any type of drink and to help your body to stay within optimum hydrated measures then water is highly recommended.
Good luck!
Driving my wagon of hope through beautiful views on my road to myself