I have both, too. Indeed, the two often get mixed up ... but me thinks BPD centres more around emotional regulation (like, it feels as though we have no emotion skin), impulse control, and ~ whew ~ the almost murderous rage (which, of course, we have trouble modulating). I sort of think that, with LOTS of self-monitoring and therapy, one can develop more appropriate thinking patterns, which will assist in emotional modulation. As for Bipolar ... its sort of like the mental equivalent of diabetes. Chemical. Meds required to stabilize.
Having BPD and Bipolar together sort of sucks ... it sometimes feels like an explosive combination.