When he does come home it will be critical that you continue on with your new outlook on life. You will need to be aware of smothering him, over talking him, not even allow him to speak, even if he hesitates to speak - long pauses...let him.
It is easy to fall back into the same scenario that you both once had...it has to be continually nurturing. That means you'll need to be aware of "falling back into that comfortable" feeling - which put you here to begin with.
It means to look outside of your marriage for your own friends to hang out with from time to time. Interests that you alone seek out to learn and try. In other words, allow him to have space...don't always do everything together.
You're feeling apprehensive now, understandably so, somewhat like you doubt this change in him, so suddenly. Doubts and or trust does take time...that clock does not start ticking until he actually comes home, for good. Try not to get yourself worked up...just let things come around in time.
When you go to Hawaii, try, also - not to be overly giddy thinking all is well...have fun, but until he's back, just maintain your emotions...okay. You'll be fine Tam.