Hi Beth, I would be in tears too if I sensed a turn in my W...how could you not?
It sounds like you have a very healthy approach in mind - and I think it's wonderful that you remember his attraction to your calm - it says a lot about what he needs - and what you offer. Reading that reminded me of something my wife used to tell people about me - that she was attracted to me because I would always react to confrontation with a lot of calmness...of course, she doesn't see that in me anymore...but I know it's still in me...I've been experiencing that calm a lot lately...
But back to you - not fixing is important...so too is not trying to correct anything he might say that doesn't jive with your sense of reality...since I imagine that anything he would identify as painful is very real to him...will you be taking your camera with you too?