Glad you and W are ready to address all this once again.
The room change, while obviously not the solution ( we all know change has to come from within), is in my mind a good idea...first off, it's her idea, and secondly, it's symbolic of a fresh start.
I hope your W keeps up her end of the responsibility and you can go about this in a more relaxed fashion. It seems that once you hit your goal and had that great nite, you just burned out( I know there were other factors as well).
One thing I'd like to add...In PM, Schnarch is so enthusiastic that he makes it seem that every encounter has to be this hot thing which just isn't the case. But certainly, that "lamb to slaughter" attitude has got to go.
Anyway, good luck and keep us posted. Remember this time you are working with the knowledge that W is indeed capable of change.