Tokyo is brilliant imo, you should love it. So many contrasts between new and old worlds and within the people as they negotiate tradition with advancement. Have a great time, in both places of course :)