Good to hear from you BB, sounds like a fun trip.
To my knowledge, our most active forum member in Japan is sneakypete.
I know sneaky doesn't live in Tokyo, but I think he visits. Hopefully he'll stop by the forum before long and make some suggestions. If not, you might send him a PM, I don't think he would mind.
Enjoy the trip. The flight is tough but I'm sure Tokyo will be great.  
