Spending time at Haneda Airport

Our international flight out from Haneda is at 12:30am and our Shinagawa hotel has allowed us to check out at 6pm. We were going to take the Keikyu line to the airport.

Are there enough distractions (shopping, dining etc) at Haneda that we can head straight there after checking out or should we have the hotel hold our bags and spend a few hours in Shinagawa instead?

Thanks.

The international terminal is generally rather small. Nevertheless, there is quite an interesting range of shops and restaurants open until at least 10pm:
http://www.haneda-airport.jp/inter/en/premises/tenant/

Whether it is enough to "kill" four hours, I am not sure. I guess it depends on the person, e.g. speed of dining and shopping.

Shinagawa is probably even less interesting than Haneda Airport.

You could get the hotel to hold your bags while you go two stops north to Hamamatsucho & take a look at Zozoji and / or Tokyo Tower.

They aren't necessarily the top places I'd usually recommend a tourist but they are close enough that there is no need to be anxious at all about getting back to the hotel to pick up your bags - it's an easy taxi ride if need be.

MUCH better than spending time in Shinagawa or Haneda IMO. There is a good Indian restaurant in Shinagawa - Devi's corner.

Sorry... that is not useful at all. I just noticed your times. Go & have dinner under the tracks at Yurakucho - check out earlier and spend a full day & just come back to get your bags.

4 hours at Haneda or Shinagawa is a bit of missed opportunity for other places.

If budget allows, you can go to a restaurant at the top of hotel building and eat fine dinner while watching beautiful night view of Tokyo.

There are also restaurant floor(4th floor) at Shinagawa station building.