I would bring up your concerns with the psychiatrist. There are several criteria for both of the diagnoses you care concerned about that a psychiatrist would be more able to identify than any of us.

I hope you and the dr. come to a conclusion that helps you direct your treatment effectively!