If you're coming through Tokyo and enjoy photography, make sure to check out the Tokyo Photographic Art Museum. It doesn't get as much attention as all the other art museums in Tokyo (Nezu, Mori, National Art Museum, etc) but it's a fantastic venue with frequently rotating exhibitions. They often pull out old photographs arranged around a specific theme from their collections, and it's always a delight.
Japan is definitely up there with France, England, Germany, and the US in having shaped the foundations and history of photography in a major way.