I am at a similar position. And was endangering my position going nuts lately.
BUT, boundaries are set by consistency. By actions. By tone of voice. By choosing your battles wisely. Last time I went thru this, it worked. I am back on the saddle to make it work again.
Regular communication sucks. I was dreading it while I was on vacation. Today, I "switched". He is not allowed to touch me anymore. And if he does, he will never know.
