I always think the criteria questions don't help. What matters is the way in which you think, and the problems that it causes you. Treat the symptoms - because you can't actually treat the cause.

BPD is varied - 5 of 9 of the symptoms needed, which leads us to work out that there are 151 different clinical presentations of the condition! Who cares? What matters is the bits that bother you. Get those treated, and ignore the labels.