Definitely work the games in a controlled fashion, given his OTT status...especially since you are finally getting him decently in hand. You don't want to wind up back where you started. But I agree, it is quite fun to do several different things...switch things up, to keep things interesting for both horse and rider. You could always incorporate more ground exercises as well, especially on days he seems overly excitable, that way you are both safer, but you still get something accomplished.
"The ideal horseman has the courage of a lion, the patience of a saint, and the hands of a woman..."