I've been surprised to hear Narcissistic Personality Disorder included under the Neurodiversity umbrella. There also seems to be a tendency to complain about this disorder being demonised, which disregards the damage that those who have it routinely inflict on vulnerable people.