Nope, but i have been, for a long time, trying to separate BPD from NPD. Many traits are so similar. I'm giving up on trying to separate them. I had to stop reading the book, "I Hate You--Don't Leave Me: Understanding the Borderline Personality" by Jerold J. Kreisman and Hal Straus, because it was causing me to lean in the wrong direction towards my ex. I've just finished the book. There's a review at PsychCentral: http://psychcentral.com/lib/i-hate-you-dont-leave-me-understanding-the-borderline-personality/
For anyone looking to change how they "choose" future partners,
I would like to suggest "The Science of Happily Ever After", by Ty Tashiro. Compared to what we've been through, it was a relief to see "traits" simply listed as Openness, Conscientiousness, Extroversion, Agreeableness, and NEUROTICISM (finally i don't have to discern NARC from BPD, etc. Co-morbidity-no-more. "Neurotic" is the trait).
This author explains the science behind the way we humans make our choices, examines the effectiveness of these traditional methods, and teaches us how to improve our odds, but does so in an accessible way. Our pair-bonding selections are universal and biologically-based, but antiquated/flawed at this precise moment in time, much in the way salt and sugar are so tempting. You don't have to put on your thinking-cap for this book. After all i've been through, it was an uplifting and very useful read.