That would be at odds with the book you drew your conclusion from.
They are personality disorders; trying to insert some kind of bias against political correctness isn't going to change that, nor does it support anything you're trying to say.
"If they were disorders they would be ego-dystonic."
I'm not sure you understand the concepts of disorders, or you're on some conspiracy trip; either way I'm not interested in debating someones opinion versus current scientific understanding.