Don't be so concerned with labels.
It took me years to be dx'ed with bpd and npd, along with other dx'es. I don't even think about what I have, it's more of a way of how to control the symtoms.
If I were you I wouldn't ask about a dx, it will happen when the time is right.