I was previously diagnosed BP 1, and then a week ago told that I had likely been mis-diagnosed and actually had BPD. My psych told me today that BPD is hard to accurately diagnose, and that it varies tremendously from one person to the next. He said that I meet the diagnostic criteria for BPD, but might also have some bipolar issues. From what I understand, it's not a cut and dry science.
What you've described sounds more like BPD than BP to me, but I am certainly not a doctor and I've really only recently done a lot of research on BPD.
Good luck with your new doc. I hope you find some answers