FC, Are you considering the granny suite as an option even with D? I know most on the board prefer separation from MH, but personally I think for someone who seems to not be too emotionally reactive, increased contact with W might be better for you. If the primary thing missing is intimacy and sex, who knows what might happen even after D.
