I am curious if you ever found a resolution to this problem. I have this problem here at my own company and at 2 client company's. Its super frustrating and yes I've followed almost exactly the same path you took to get to the same point. I'd really love to find a resolution sooner rather than later.