I was originally "diagnosed" with both......p-doc wasn't sure so he let it ride for a while. I'm officially BP2 now but I do display some BPD characteristics like black and white thinking (called "splitting"), uncontrollable anger, and substance abuse. However, I'm not scared of being abandoned, I don't care if people like me or not, and I'm comfortable with who I am.

IMO, you have to show a lot of BPD to get a diagnosis. In addition, perhaps you need to display at least one characteristic that isn't common in both. For example, I don't think BP is marked by irrational fears of abandonment.