To get back to the actual topic on the post...
I have visited Kyoto and am very happy it was spared.
It is a stunning city and if you only have a short time in Japan (and are interested in history etc) I would definitely say visit Kyoto over Tokyo.