Looks like you're off to a good start. However, I've heard Tokyo is a full day. You might want to plan another. You can feel your way out on the first day and find stuff to do other days. Either way, I'm sure you'll have fun. I'm looking forward to a picture of you in a Kimono.