Morning all
Shibuya shuffle is a must Elle, especially at night. Nismo shop in yokohama, and the factory tour just down the road. Normal disney was pretty good, (carni food was amazeballs), go to the big Upgarage up near disney land, it is the better one.
If you are catching the train everywhere, head down to tokyo teleport to the toyota museum/workshop, they also have a really big shopping centre down there with a big transformer out front