If anything, I think I like your idea even better, because I think it demonstrates how cultural, constructed and context-bound definitions of what constitutes sane and insane behavior better - I think the other traits he throws in there may draw attention away from that aspect of his concept.

After all, it's only paranoia if they're not really out to get you, isn't it?