Okay, I did see my new therapist a few days ago. I was still in the system at my agency as Schizoaffective Bipolar type (although they changed it in the hospital to Depressive type in 2015). She explained that if you've ever had a manic episode your type is bipolar.

That makes sense. I accept that (today anyway lol). I agree that I've had at least one manic episode, but I tend to stay on the depressed end. I also agree with the Schizo aspect. I did hear a voice again about two months back. I'm viewing this in the light of I'm so much better and that's why I've had so few symptoms. She removed GAD and replaced that with PTSD. I'm SO relieved.

We both agree that the GAD was just an expression of the underlying PTSD. I'm not struggling with GAD right now, but the anxiety I experience with C-PTSD is still there. Schizoaffective Bipolar type and PTSD (C-PTSD honestly, if it were included in the DSM) are my current diagnoses and I agree with that.