Depending on how much time you have in Tokyo, Odaiba is definitely worth a visit. You could quite easily spend the whole day there .
Catching the Yurikamome line from Shinbashi and getting off at Kaininkoer from there you can plan your day visiting the shopping malls, Mega web or just Gundam the giant robot outside Diver City.
There are whole stores here that cater for dog lovers. You would be wrong in thinking the strollers are for babies.
Odaiba is a great place to visit in the evening
Last time I decided after visiting Odaiba a few times I was going to catch the Himiko water bus from there on the 50 min trip over to Asakusa. Catching the boat from Odaiba Sea side park at the pier at Aqua City. Tickets open at 10.30 for the departure at 12.10 so gives you time to go off and see a few things before hand. The cost of the ticket was 1,520 yen . This is a great place to start if your thinking of going over to the Sky tree or Senso-ji