I quit coffee and energy drinks and switched to green tea, which I have really grown to love. Now I suffer less anxiety, mood/energy crashes, and stomach problems, but I still get a subtle lift and a lot more anti-oxidants.
It may be a bit much to dump the caffeine and change your eating habits at the same time. If you do go that route, go gradual, because caffeine is a physical addiction albeit mild. Start with 1/2 caff 1/2 decaff. The cut back to 3/4 decaff for a week, and then decaf.