Personally, I would go with my psychiatrist's diagnosis. They are far more trained to make a proper diagnosis. However, therapist's opinions are important to consider as well. Mentioning to your psychiatrist what your therapist thinks could be useful, because then maybe he/she will agree that you have PTSD (as well as Bipolar).