You are absolutely right to set conditions. Insist on Retrouvaille before he moves back in. Counseling is good, but it does not have the intensity of a full weekend of focus. He can talk to the Bishop about it.