if you order coffee at a coffee shop, you can ask for milk or half&half, instead of the normal heavy cream they put in it. Also, I don't know how you usually take your coffee, but I wouldn't get in the habit of taking it "extra extra" with extra cream and extra sugar. I've been taking my coffee black recently, or with like 1% milk and that Splenda stuff (which is pretty good). Iced tea can also have a ton of sugar in it. I prefer to make that myself as well, or to get it unsweetened and add my own sugar.
I would say that you're likely making the right choice in cutting the energy drinks out.