Thanks for all the great ideas! I think we will try to stay in Tokyo for the four days rather than doing another day trip as there is so much to see and do as everyone has suggested. We are really looking forward to Toyko and thanks to everyone for the great suggestions!