Feeling temporarily brave enough to attempt proper replies to Springy and Sea (thanks, beer!)
Sea, there's a blog somewhere on the DSM5 website, with tons of pages about the PD question. I found one for another thread, couple of months ago, which was very illuminating on the tweaks that are being made and why. Sorry I didn't bookmark it.
I am heartened to hear about the 'personailty traits'. I understand there's a lot of daggers-in-the-night politics over each DSM, especially in the psychiatric areas, so this will always be under dispute. We all find our favourites and I often refer to John Oldham's work on personality. He was one of the team that originally defined personality disorders. He's always been clear that PDs are best understood as distortions - caricatures - of the 'normal' personality. It is a spectrum and, since personalities are multi-dimensional, more of a scattergram than a bar chart. DSM5 makes the first serious attempt to encompass this multi-dimensionality. While it'll take a PD diagnosis away from some patients, it will simultaneously allow for diagnosis (and, thus, treatment) of others whose personalities are dysfunctional but not an exact fit for the PD criteria :)
In any case, the members of psychforums, after fulminating over DSM5 for years, seem reasonably happy with the current revision so let's hope it goes into practice successfully!
Springy, assuming one can get away with reasonably superficial relations with a Narcissist, I'm all in favour of interactions that will work. It's no different from dealing with any other person whose take on reality looks inaccurate to us. We do it with children all the time and admire their rich imaginary life! With a bit of study around a person's individual foibles (and likely diagnosis), we can meet their needs and speak their 'language'. It seems to me a kindness. And we are the ones who must make the effort, because our thinking is flexible where theirs is not.
Before learning about PDs and assorted other forms of mental difference, I thought I could 'manage' disordered people by bending myself to fit their world view. Needless to say, I came off much the worse for my uninformed attempts. These days I'm better at it, I think, and am also very careful to avoid involvement. I'm a lot more grounded. As long as I don't expect the dysfunctional person to like me, I don't get upset 
I don't know of any way to keep it up over extended periods. I can manage a week-long visit, for example, or a business meeting. But the thought of working for another loon like my last (classic NPD) boss makes me want to die! If such a dreadful thing were to be unavoidable, I think the best I could do would be to channel a compliant, grey mouse. That's so far from my real personality, it would probably damage me - but not as much as my time with Mad Boss did before.
Sorry, Springy, this has been rambly and probably not much help. Want to write any more about the potential situation which bothers you?