try to have a sit down time once a week where you get to talk frankly, with no repercussions, about you situation, where you can share your thoughts with each other on the same level without the whole "M/s" thing there.

Some people like having the 'contract' and I think that the contact can be an evolving thing and during those sit-down talks is when you can negotiate/re-negotiate aspects of the contract.