I wouldn't detach in this case. I think he is expecting you to detach and he is waiting for you to do just that.
I wouldn't change a thing. I know you are stressed. If you can find a way to be more accceptiing of his ways in order to feel less stress, that is best.
I don't know......just a gut feeling I have.
