Thanks, hopefully that's the stage we're getting to. My wife hung posters on the walls with exercises to help him calm down and I've been quitting work early to be able to spend more 1-on-1 time with him in the afternoons.
What incentives worked for you? We've tried the points/sticker chart thing without any luck (allowing him to redeem his points for audio books, tv shows, treats, and even Dave and Buster's if he saved up a lot).