Chris,
Thanks very much for the quick response! I actually just got some good news that I was able to switch to an earlier flight into NRT - I now arrive at 12:55p, so I can book a hotel and spend my day in Tokyo without fears about timing!
Best,
Phipps