There is a lot of good here! Take heart in that and keep that wise little secret and use it to your advantage. Keep doing what works.
As for the mystery thing, I think it is a good thing to keep it up a little once you've moved back in. I would suggest mirroring his movements toward intimacy. Meaning if he is sharing more with you, why not share more with him? Give him what he gives you and let him lead the level of intimacy. It will definitely be harder once you move in but easier at the same time. You'll do great like you have been doing.
