I think you just have to do what works, and what you feel comfortable with. All dogs learn differently, and different methods work. Consistency is what's most important with any of those contradictions. For puppies, I think it's best to go with the least aggressive or non-aggressive methods, this way the dog can build trust in you and not learn to be fearful. However, if it's been a long time and one technique isn't working, you have to try another one and stick with that for a while and see if there is any progress. You have to make sure once you make the rule (ie no tug of war, jumping, etc), you have to stick with the rule. Nothing is more frustrating than a confused dog, and this can lead to a bunch of problems. For the small loop you are in.... maybe you can give him a couple of ice cubes? It'll give him water very gradually, so it quenishes his thrist, but not enough to fill his bladder. What time is bed time? Do you take him out right before bed as well?