If anyone's interested in this enough to buy a book on it, I highly recommend Millon's Personality Disorders in Modern Life. It touches on a lot of the issues that the GP asked about including how to distinguish personality disorders from traits.

http://www.amazon.com/Personality-Disorders-Modern-Theodore-...