Another option to consider is using a luggage delivery service from your hotel to the airport (e.g Kuroneko Yamato). I think for airport deliveries you need the luggage collected 2 days prior to your flight departing (i.e. on 4th, if your departure is on the 6th) so depending on how many bags you have, and how much stuff you need the day prior, it may or may not work. In some circumstances it can be very convenient. Most (all?) hotels and many convenience stores can arrange for this for you.