I don't think that you made a rash decision that he is a narcissist. You presented to us series of symptoms that led you up to this conclusion, rather than picking one isolated event and jumping to a conclusion. It's well thought-through, well-articulated, and highly-informative.