Have your doctor re-evaluate him. It could be OCD or the inflexibility and stereotyped interests of ASD. Are the rages due to inflexibility as found in ASD, or is it extreme anxiety at not being able to follow through on the compulsive shopping behavior. It seems to me that hyper-focus is more of a positive behavior for the ADHD person and does not come from a place of inflexibility or anxiety. BTW it does sound like my son who has Inattentive type ADHD, and was recently diagnosed with medication induced OCD. His obsessions and compulsions def come from a place of anxiety. Otherwise he is fairly flexible in his behavior, and has certain subjects that he just really loves like space, planets, and before that dinosaurs. He’s a science kid.