I have lot of Borderline traits as well and BP2, although my doctors and care workers havent ever mentioned anything about borderline to me, probably because i only have those symptoms HALF the time. I dont think i'd have any BPD traits if i didnt have Bipolar, so i think you're probably right.
Her dad has Bipolar, but she has had nothing to do with him, does it skip generations like being ginger?