My ex and I had similar problems with Scotty, his border collie. It turned out that he had too much testosterone, and a course of progesterone tablets helped immensely.

Other than that, retraining with a magic word might help. Let me know if you need details of what a magic word is.