One thing you might want to do while waiting for your new pdoc appointment is to do some of the quizzes on here. I scored really, really high on BPD and fairly low for bipolar.

I don't SH either but have 8/9 criteria, you only need to meet 5 of them.

Good luck in finding what diagnosis fits best.