If you haven't spent much time in Tokyo, and don't plan to come back in a while, I'd say it's worth it. A day or two in Tokyo isn't that much, but at the same time, I would take advantage of any time I can spend there.

If you have, the Narita suggestion is a good one. A very different side of Japan.