I'm close to the same age as you and I just got diagnosed. I was always diagnosed as major depressive disorder.
Could it be that the ADHD caused the depression because we beat ourselves up for all the disorganization and chaos that goes along with ADHD? Maybe once we get that ADHD worked on, our depression will start to lift.
I do know how frustrating it is to have all these diagnosis and have all these meds thrown at you. It is maddening.