All you suggested and let me make one more addition - you really need to talk to each other and communicate. A wise man(who had two or three divorces along the way....) also suggested never go to bed angry. All the above and then whatever else makes you happy. Those SXM trips will help, too.....