I'm not going to be much help other than to say "hang in there". I'm FINALLY on the other side of Augie's adolescence and he could be a real, um..."Ausshole". The animal who could jump 6' into the air while lunging to play with a passing dog, will now simply sit quietly with just a whispered word. It's not that *I* did anything differently - he just needed to mature between the ears (and I didn't have problems with pottying in the house)
My daughter's (neutered) Shih-Tzu was a notorious "marker", so when they needed to move in with us shortly after our new carpet had been installed - I said OK only as long as he wore a belly-band diaper while indoors. Worked great! I also had put them on my Jimmy, who was elderly, diabetic, and would occasionally "leak" in his sleep. Amazon sells them - the ones we had were soft and washable