Peter,

I would suggest that you lovingly present your needs to W and say that it is no longer working. It is up to her to step up the plate and figure a way to satisfy both of your needs in the M.

Fingers crossed that your talk goes well with W.