I just went to Tokyo last month. Let me check my list and see where I went. The big must see it's if course the Kato showroom and shop. Actually, while your there, maybe you could see if they have the amfleet inside bearing trucks that are sold out here.
I'll give you the shop names and corresponding subway stations.