FWIW, my p-doc once told me it doesn't matter about his diagnosis. He calls himself a "diagnostic nihilist". He's more interested in treating the symptoms and other issues that come with it. I take lithium (before I was on Depakote) and he says I'm BP2 but I could be BPD too.
I'm actually glad I'm BP because now I can run away from a scene I created and yell over my shoulder "sorry suckers, I'm bipolar"!
Focus on your symptoms and just getting better. Climb the mountain one step at a time. I'm on a great one month roll right now - best in probably 20 years - so I'm passing on some goodness.