The research I've done on the topic suggests there is a continuum and some overlap between the two. But, in general pwNPD's don't tend to attempt suicide or cut themselves. Even though pwNPD's are unhappy, they tend to have a very high opinion of themselves.

Have you considered going to another psychiatrist, or perhaps a therapist and telling him about your thoughts on the matter? None of us here are trained professionals.