I'll be going to Osaka in October for at least a year. I have an obsession with castles and churches, so I'm sure I'll visit every castle and temple I can. I'm really looking forward to seeing Kyoto too. I'll definitely be getting to Tokyo as often as I can as well. I've been told not to miss the Ghibli Museum there. Way too many things I want to see to list here.
ArmandIV, thanks for the tip. I didn't know there was a bandai museum. I'll certainly get there too. (I'm a big Godzilla and Ultraman dork) Are you writing a book on Toho or Godzilla?