I don't know the Kodansha (other than they do a dictionary), but you might also want to look at Kanji Odyssey:
Learning Materials of Japanese Language - Kanji
Don't worry about learning all the joyo. If you like the concept of Heisig, search for a thing called "RTK Lite" and also "Heisig Japanese keywords". I'm personally much more on the context learning side of things. An understanding of radicals/components of kanji does help.
To be honest, you won't really
need Japanese in Tokyo.
More general (and random) advice:
Don't neglect your katakana, menus etc. will be absolutely covered with it and words that are derived from English can often be sounded out (not all katakana is from English, or foreign origin at that, but a lot is).
Pick up some generic phrases like "これください" (this one please), learn numbers/dates/times and how to ask about them (how much stuff costs, when places are open to, etc), and set phrases - including those you might be asked (ここで召し上がりますか). Much of this will be found in textbooks. A tourist phrasebook might be worth it just as a guide to common phrases/vocabulary.
Food words - start off with the generic things - e.g. learning 牛・豚・鶏・魚・野菜・海老 will give you a lot of bang for your buck, so to speak、as will things like 甘い・辛い・塩 and 丼・鍋・定食 (or セット)・汁 Menus usually have pictures on anyway, so as long as you can recognise what's beef and what's pork, you'll have a reasonably good idea of what you're likely to get.
For practice, just google for メニュー as lots of the major chains put theirs online. Although in some places you're likely to be handed a menu in English anyway. Obviously adjust to preferences - you might already know at least some foods that you particularly like, want to try, or want to avoid.
If you want to virtually wander about and see what the signs are like, Google Streetview has pretty much all of Tokyo (and by extension, the earth). I like to streetview the route from, e.g. station to hotel just so I get a feel for landmarks in advance.