That sounds right. My daughter was diagnosed with bipolar, and sometimes when she is 'manic', she has psychotic, paranoid delusions. She was the one who noticed it and decided that it was "wrong", and went to seek treatment. Her delusions were as mundane as; she thought that her friends were all meeting behind her back, planning to ruin her life.

Anyway; psychosis is more of a symptom. Psychopathy, itself, is kind of a category of disorders; where psychosis is a common symptom.