You make some valid points. He certainly has NPD, but there are also elements of him that fit the criteria of Hare’s definition of psychopath, especially the callousness, the blaming of others for the problems he’s caused.He's a malignant narcissist with borderline personality disorder. To say he's a "psychopath" is pretty extreme. If Trump is, he hides it really well.
He checks the criteria for NPD, but for psychopathy it is a bit murkier.
Agree with you on that front.