AzulOscuro, I understand your concern. There are overlapping symptoms for different disorders. The important thing is to not only treat an illness but to start the process of recovery and inventing a new identity. Sure you want to stay on medicine and therapy because that is helping too even if you have multiple dx's.

this can be by socializing, going back to school, doing hobbies, joining a group that shares your beliefs, practicing mindfulness, yoga or exercising. If you do these no matter what you are suffering from there is a probability your symptoms will be less pronounced and your focus will be less on overcoming a disease and more on reinventing yourself based on what you want to do with life.

If BPD is important to explore, here are some links
Psych Central - Search results for Borderline personality disorder symptoms