It really depends on where you want to visit. Planning to hang out as much in Yokohama or places south of Tokyo as in Tokyo itself?
I'd split one week in Ueno (Ueno Park, Zoo, museums) or Asakusa (convenient for Tokyo Skytree, daytrip to Nikko) and one week in Yokohama with daytrips to places you mentioned.