On the diagnosis - go with what your present therapist says you have. Criteria for mental disorders change from time to time for example back in the 1970's people with dID were diagnosed with Schizophrenia because back then they did not distinguish between the types of and location of the voices the person hears.

If you want to know what your present diagnosis is ask your therapist for a Comprehensive Psychological Evaluation. This type of testing includes interviews with a psychiatrist or psychologist, computerized and oral test questions, IQ testing and any other tests that they feel with benefit in helping to diagnose you. When you get the results of that test the report will include your diagnosises on the miltiaxil gorups, and your psychological functioning level, your IQ, Where you are on the dissociative disorders scale, and your treatment plan recommendations.