My diagnosis is back to NPD after thorough psychological testing. I'm a malignant narcissist, but alas still a narcissist so that's my update in the psychology department. Heh.