What does your tdoc say of 7 years, when you mention the self injury to her what does she say? You may have both...I once was dianosed because of some self injury type behavior but it really is a more OCD thing. and I am bp1.
try googleing borderline personality..there will probably be quizes etc for you to take to.
what is important is to feel better. Many of the meds used to treat either disorder are the same...so feeling better is the goal.
WE all have issues and hopefully your therapist has helped you to work on them.
I wish you wellness.
bizi