Cutting grains and simple sugars will help, if you haven't already done so. Sea salt...perhaps aldosterone supplementation...more healthful fats... . I cut out all stimulants. It took a while to get used to.
How often are you working out? Working out so hard that you feel that you need caffeine/stimulants isn't going to help the adrenals recover. I've been there. I used to watch lifting videos and look at pics as I drank coffee before I worked out. Before long I was drinking coffee and taking a tab of ephedrine. Then I would go to the gym and do these Mentzer-type workouts.... a couple of years later I crashed hard and have never really made a complete recovery.