I am in the same position. There is a lot of overlap in the criteria. I think borderline personality disorder (or emotional stability disorder) adds an intense fear of abandonment and a more constant state of rage.