You can definitely have social/emotional goals and no academic goals, as long as you can show the social/emotional disability is impacting access to the general curriculum. Think about what social/emotional goals you think he needs. For instance, does he need a goal for self-advocacy when he's feeling overwhelmed? Does he need a goal for recognizing the need to take a break on his own without prompting from teacher? Does he need a goal for staying on task while doing assignments in class? Be prepared with specifics. Ask his general education teachers what issues they are having and prepare arguments that the issues are related to his ADHD and need goals. If the school evaluation comes back showing he doesn't need any social/emotional goals, don't forget you can ask for an Independent Educational Evaluation (IEE) at no cost to you.
If meeting regularly with the school psychologist is enough and there is no need for any goals, that could be addressed in a 504 Plan.