get some anti-anxiety medication and make puppy a Prozac dog. That may help in the real solution which you have already suggested- back to house breaking training.