I just wanted to offer you my support. I am a nervous wreck myself right now.
Honestly I would have done the same as you.
I would accept his advances IF you feel like it.
Be prepared for all the emotions you will get visiting his parents. You will be overwhelmed. You will feel happy one minute and sad the next. So be careful tread with care.
I would not ask him anything about the gift. Just go get what you think they would like. I noticed you ask him a lot about stuff and his opinion. As small as this is it may be a little bit of an eye opener for him and you for you to choose the gift without his imput.