Shinagawa is best if you will just make a transfer. The platforms are very close.

I frequently would head for Tokyo in early morning for a late afternoon flight and roam around Tokyo for a few hours. Then I would store the bags in a locker at Shinjuku or Tokyo Stn and take N'EX from there.