Despite the fact we'd be landing in Tokyo at 20:00 and it'll take at least 2 1/2 hours to get to the hotel, we'd still prefer to get to Tokyo and not spend a night at an airport hotel in Narita.
Yup, it's the same hotel we've stayed at during the first visit. :)