Do You Have Any Suggestions for Returning to the Class Environment?

Roy and I are taking a break from agility to work on arousal issues. We're doing work outside of agility and are getting what ring time we can. But do you have any suggestions for returning to the class environment? Just go in the ring and work on on leash focus call work so he can succeed. And I don't send him further into arousal or is that asking too much?