I think Chris is right to identify the possibility of depression.

With the aggression, dislike of surprises/change in routine, rigidity, need for rules, in addition to anxiety, I'd also raise the possibility of Asperger's syndrome.

You have a good list of symptoms and observations to present to the neuropsych. With that list, I'd make sure they do the ADOS (to check social skills) and the Vineland (adaptive behaviors checklist) in addition to depression/mood disorder testing and the usual workup.

DeeDee