I wonder whether at this stage with so many diagnoses's flying about, maybe it's time to just concentrate on the certain behaviours you want to change rather than putting a label on them? The diagnosis isn't important, you the person is what is important.