Bipolar disorder with psychotic features is a closer match, or schizoaffective disorders.