Lucy Johnstone, PhD is a marvelous British psychologist on the cutting edge of what's good in the field.  She promotes"psychological formulation," including the patient's input, to replace psychiatric diagnosis.  Yes, replace it!