Sounds like you handled it perfectly. My husband and I have the morning and night problem too. But we are the opposite of you -- I am the night person. Still, I now always welcome his advances in the morning. I can catch up on sleep later.