I'm glad you're finally getting somewhere with getting the right diagnosis. Taking those tests you mentioned may bring even more clarity. I hope you get diagnosed and get the appropriate treatment.
I've been trying to do the reverse. I've been diagnosed with BP II and GAD but I honestly think I have MDD. The pdoc keeps pointing out that a mood stabilizer is helping me. Yes, it does....to sleep at night. I had insomnia with my depression so that helped me out. I see him next week and think I'll bring it up again.
Congratulations on obtaining your masters!!! Best wishes.