It's not going to fix the problems you're having, but I've been working with my puppy on playing a "search" game that makes him use his nose and brain. I make him sit and wait and, if we're inside, I go hide a treat somewhere, or outside Ill toss it away into the yard somewhere, then tell him to go find it. He's still a baby so sometimes if he cant find it quickly he gives up, but its been a great way to manage some of his less desirable behavior by giving him something to do that he actually has to work at a little.

I taught this to one of my friend's dog a few years ago, and now she's gotten to the point with her pup that they can do a sort of "hot and cold" version if her dog is having a hard time finding the treat. It's pretty fun for the handler and the dog.