Yup, you sure hit the Tokyo spots. Personally, Tokyo was not my favorite city in the world. I much preferred Kyoto. The Kinkakujin is my absolute favorite "tourist attraction" that I've ever been to.

But yeah, Akihabara is great. I just hope you don't feel too crowded. Probably not, since you won't be there too long.