(you could always try both and then let us know which was better! )

I've tried both, and the transfer at Tokyo station is ridiculously long - a good ten minutes at least from the Yamanote platform, and it can be quite crowded. I go out of my way to avoid that particular transfer.