I agree on not sweating the small stuff, too. We were running all evening, so it was McD's for dinner. There were trucks replacing the parking lot across the street, and S wanted to see them. I surprised him by saying "Sure!" We all got out and sat on the hood of the truck, while he explained all of the machines and what they did. It was only a few minutes. but it made him so happy.
My H had the same reaction to conflict--I am so glad to hear that you are finding it in you to stick it out!!
