Cool max.
Just one thing to say about the tug o war. Its good for a spookish puppy, but for a dog who is already confident, it could lead him to believe that you and him are on the same level. Maybe find someone else to antagonize him. I just got a new german shepphard pup, he's 9 months now, and Im using the fact that all the strays are at our house because the neighbors dog is in heat. So because all the males are outside barking and raising hell, and I cannot get any work done, Im outside teaching my lil Jaws to 'watch' the other males and not be scared. He's not ready to mount her and still not as confident as he needs to become, but I suspect its working well for his confidence.
I try to stay away from hand games (where he chews on my arm, even though he's not biting hard) and tug-o-war because I dont ever want him to suspect he can challenge me. When he's a bit more obedient, Ill hire a stranger to antagonize him.