I think you handled the shopping expedition beautifully. Yes, he wanted to be part of that activity and I would bet he never did it as a child, so it's one more childhood experience that he can mark off his to do list as a "man/child".
From your posting, your h is slowly, but ever so slowly, moving along. He's still very fragile and is testing the waters by joking and calling you by your old nick name.
You are handling your situation very, very well. Why? Because you understand that your h is actually reliving a part of his unfinished past and you are seeing the various ages as he progresses along the path of his life. Keep up the good work. I know it gets to you at times, but, when it does, take some time out for yourself and recharge your battery.
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.