Non clinical solution for ADHD???

I was evaluated by my psychologist with the DSM-5 and she diagnosed ADHD and saw signs of social anxiety last year.Then, he suggested my parents that I join Candradimuka social class. 

However, Candradimuka social class is not a clinical solution for me who has ADHD. Candradimuka and my coaches only suggest generic things and basic social skills and basic discipline skills.

In fact, one of the coaches said that I don't need to worry about trivial matters. For example, he said that catcalling can be reported to the teacher. I explained that people who catcall might not stop even if I report the teacher or I tell them to stop. I think I have a deeper fear than catcalling being reported. I feel uncomfortable if guys see me as just a pretty girl.

Candradimuka classes often make me read basic materials and listen to generic suggestions. Often, my fears and ADHD issues are not studied in depth. I once said that I wanted to try CBT only. But there were also coaches who said that they wanted to try to increase my enthusiasm and improve through social classes first. My psychologist also claimed "This is your CBT!" with the intention that the suggestions he and the coaches gave were a form of CBT

I see messages in online ADHD communities from people who have been diagnosed with ADHD. ADHD is clearly a lifelong neurological condition. 

There are also suggestions from my psychologist that it is overwhelming me because zoning out is a stress response. So when I am told to keep moving or increase my activity, I end up exhausted and overwhelmed. 

Now that I confront about this, he is going to do Hypnotherapy even when I suggested CBT. He never does CBT. Now he told me to visualize the state I want to be in and set my mind that way. 

I need CBT cause when I get stressed or overwhelmed, I zone out which leads to executive dysfunction and difficulty starting tasks. Those things are INVOLUNTARY

Is this an ethical thing for my psychologist to do?