Sounds like it is going well. Keep doing what you are doing.
In response to your question about your H's comments, I do think it is both good and flirtation (not pre-flirtation). I did the same with my wife, usually b/c I was testing the waters for ML.
