Glad you had fun on your vacation even w/the electric off for a few days. You needed that time to recharge your battery.
I am also glad to see that things are starting to settle down a bit. I totally agree w/your therapist. Focus on having fun together, i.e., dating like you did in the beginning. Keep in mind, this is a new relationship and that means not falling back into old habits. Dig deeper for patience and it could take up to 18-24 months before he's finally settled into his own skin.
Don't rush the process...it will take as long as it takes for him to feel comfortable and actually open up to you.
Sit quietly, the answers will reveal themselves when you least expect them to. The past is gone, the present is a gift and you need to focus on today, allow the future to reveal itself when it is ready.