I'm not saying I'm an expert but I do listen a lot to Robb Wolf's paleo solution podcast and fixing sleep habits has a lot to do with fixing cortisol levels. He talks a lot about a book called "lights out." this books has a lot of research about sleep. I'm talking sleeping hours you are supposed to sleep so as to keep cortisol low when its meant to be low, making your room dark as a cave to prevent any light including artificial light from entering your eyes. Without getting too much into it, fixing sleep will definitely fix a lot of things.
So yeah too high cortisol levels can lead to adrenal fatigue etc. Try googling Robb Wolf and low testosterone. Should bring up the article he wrote on how he naturally brought up his test levels much the same ways you did. He also used some supplements I think dhea? I can't remember off the top of my head. Just thought I'd put my 2 cents in.