If you get chance be sure to visit Kyoto as well - all the historical stuff is there, and it's really pretty!
Sorry I can't help with the advice on Tokyo shopping, I used to live in Kyoto, and so do not know Tokyo that well.