I think S.T. makes a great point here so I'll just second that motion! Even if you're feeling a little worried, insecure, etc., that things might go south and that same old stuff will rear its ugly head, don't let it be reflected in your actions with him. I think the advice on how to approach him with this concern that S.T. gave you is great -- I would follow that recipe myself if I was in your shoes and my worry was beginning to get the best of me.
It sounds like things are going pretty well for you, though -- keep doing for you as well as for your H & M -- keep us posted on the things and for insight and opinions if/when needed!
