You have hit it on the head as I see it as the HD spouse. All of you suggestions are right on the money. I would expand #2 to also included different types of hugs. Friends hug each other from the front. Hug from the back sit on each others lap to hug, etc.
I would also emphasize #3. Anticipation for me is an incredible experience. Since we don't ML very often, I often catch myself thinking "I don't want this to end" while ML to my W. If you can prolong this period by letting your H know that its coming for a few hours. It could certainly improve his disposition.
