I think you make some very interesting points, and ones that should be disseminated throughout our culture.
NPD is not the same as simply having narcissistic traits or behaviors.
I've known plenty of people who think only of themselves or have an inflated ego. NPD, as you've spelled out has specific associated behaviors.
I have a theory that our culture has raised most straight, white men to be narcissistic. The world in many ways revolves around them (clinical testing/drug trials, car safety geared to their size and shape, marriage being designed as a way to hand over ownership of women from their father to their husband, etc.).
I don't, however, believe that every straight, white man has NPD. It's an important distinction you are making and one worth educating the masses about.