Another option, depending on where you want to spend time in the city is to put your bags in a coin locker in Shinagawa. Really, any station on the Yamanote between Shinagawa and Ueno should work well for this, I would think.