All of that sounds good. Also, glad to know I'm not the only one who can't sleep and is staying up this late posting...lol. I am bringing at least my regular stroller for Ethan (and it reclines which will work if he falls asleep). DH suggested the double stroller b/c Andrew sometimes likes to ride in that, but neither seat in it reclines, so it would pose a bigger problem like you mentioned.
Anyway, looking forward to meeting you in person and I know we will have an awesome day. Have a safe trip.