This is interesting. I'm a Myers-Briggs INFJ, which does seem to correlate with either BPD or cerebral covert/fragile narcissism. No way is Sam Vaknin INFJ, even though he does display borderline traits and has sudden emotional outbursts (but only of anger from what I can tell). I'd definitely put him in the T camp. The rest is right though. I think F is definitely more covert, T more overt.
I agree with somatic narcissism correlating with the Sensing type rather than the Intuitive.
HPD would most likely correlate with the Extroverted Sensing Feeling type (ESFJ or ESFP)