Planning my trip to Tokyo

Thursday - be jetlagged, going to arrive in the afternoon, so I will probably just wander around the local area at night.
Friday - Shinjuku and Shibuya - need to kill some time on my own.
Saturday - Tsukiji Fishmarket, Ginza, Imperial Gardens then to Shinjuku for dinner (as it suggests in the Lonely planet)
Sunday - Harajuku & Aoyama - surrounding areas, which ever day it is when all the dressed up action is going to be.
Monday - Ueno - museums around Ueno, Parks and Temples.
Tuesday - Odaiba - to see all those crazy buildings.
Wednesday - Akasaka & Roppongi - surrounding area, Roppongi Hills.
Thursday - Ghibli museum at Mitaka and surrounding areas.
Friday - Akihabara, Electric town and surrounding areas.