Yes to the Ginza and fish market. Yokohama is nice too. Kamakura is beautiful and walkable through the town/great Buddha.
If you have a little extra time, try dinner at Ukai Toriyama in the western hills.
ukai toriyama（ã†ã‹ã„鳥山）
Or down to Kyoto....