As far a supplements go, I highly suggest seeing a qualified homeopathic DR in your area. I have been seeing one for a couple of issues I am going through (UTI, discovered intolerable pain with Pedro when getting intimate with my wife) and he cured that within 2 weeks.
My issues are very similar to yours. He wants to boost my testosterone, reduce my cortisol and a few other things. If he was able to eliminate my UTI within a couple of weeks, with natural stuff, I know I'm in good hands.