One of the things you should also do is get rid of that flavored trash. Those artificial flavors are horrendous for your body dude. I do love black coffee though but can’t stomach the tea without milk at a minimum in it lol sometimes a little honey.
A good alternative for me has been switching to decaf coffee and it’s helped me get off the regular stuff. That and different tasty tea combinations of the herbal type like lemongrass ginger.