Thanks for the quick responses!
We only have 3.5 days in Tokyo. Our trip is actually to Thailand, but we have this short stopover, and I'm trying to maximize our time there. Maybe I'm trying to schedule too much?
LiarsSF - Our 12-hr layover is on the trip back home. I'm also trying to determine how to fill those hours.