Thanks for the comments! It does make me feel better that we're not the only ones.
I actually am considering signing him up for an intermediate training class which involves:
For dogs and puppies who have completed Basic Doggy Good Manners. Dogs must know sit and down (for hand signal or verbal), stay, wait, loose leash walking and basic recall to participate. Topics covered include heel, heeling past other dogs, advanced stays, stay for petting and stranger approach, stand for exam and advanced recalls with high level distractions.
He never took a basic class but I've taught him all the basics as well as many tricks and fun things so they usually accept you in a class, even if it helps him a little bit, that'd be cool.
It's a 7 week long class for $145 starting late January.