I'd also pick September. It can still be a little warm, and there's always the threat of a typhoon, but it's generally a decent time of year in Tokyo.
November would be a close second choice... and May last because of the aforementioned rainy season.