I love Tokyo, and it is not lacking in culture, but it seems that Kyoto would be better for your purposes.

Just one caution, though. I know people who have been disappointed that Kyoto does not look like the set of a samurai film. There are plenty of areas that are completely modern. However, the history and culture are there if you know where to look, which is why a city guidebook is essential.