If it does not bother you too much or don't disturb you own day, I would say you do all the picking up and driving and then have lunch with him.
That's some opportunity to do "as IF" and "180s", dress nice, look good, be polite, be a little happy, show with actions that you are feeling pretty good, show some interest for his talking, look him in the eyes, enjoy your time. Who knows what is he looking for?
I agree with you that being detached is the best approach, if you can then it will help you to talk nicely with him.
