I don't know that I would say anything with regards to last night. If you find the words coming out of your mouth or he brings it up, just say it was a moment and "I'm working on that".
Instead of thanking him for taking on responsibility, how about just a nice "thank you" when he does a specific task.
