Happy to help - although we have strayed out of SLF and this thread really belongs in Night Stop - so it will benefit others who might be visiting Tokyo en route. In here, we tend to talk about experiences when we are being carted, not when we've arrived.
A bit more information about your length of stay and whether you are in the airline industry would be helpful. I'd recommend the thorn tree or suchlike if you need advice on a holiday per se, as there is no suitable forum on Pprune.
Have a good time!
BOFH