I haven't read through your entire sitch yet, but I wanted to add that you can't worry about making him happy or if you make him happy. You can only make yourself happy.
I agree agree agree with Matt....look for his actions. My husband just came home after a month. I don't care what he says,I'm on the look out for all those actions that show he cares and wants to be here.