ps - this is sincerely not meant to be another curve ball, so please know I'm not trying to stress you out any more than you probably already are! But, fwiw, with kids who have challenges, you don't usually find the answer in one nicely wrapped package, get the help and then just magically move on. You may have heard elsewhere it's akin to "peeling an onion" - you figure out the first layer of challenge, deal with it (accommodate or remediate or whatever), and beneath that layer you might very well find that another challenge is revealed. It takes time. So be sure to also focus on your ds' strengths and supporting him in those areas too.
Best wishes,
polarbear
