It sounds like this weekend was fantastic. Don't worry about the initial conversation with W. It didn't cause permanent damage. You recognized the behavior and changed it on the fly. This is as important as totally eliminating the behavior.
me: 45 W:45 M 20 years T 22 years S14, S13, S11, D9 BD 2/28/14 D papers served 3/3/14 I moved out 3/15/14 MC start 4/2/14 I moved in 6/2/14 D suit withdrawn 6/30/14