That's a long commute! Do you work at the U.S. Embassy?
I used to go to a great bike shop in Kamiyacho - Y's Bike Academy.
http://www.ysroad.net/ The guy I knew there left to found his own shop ("Sports Bike Hi-Road," down in Musashi-Koyama), but that is still a really nice place.