Extended bag shipping/storage - HND

Our current itinerary has us going from Tokyo -> Osaka -> 10 days in Hong Kong -> Tokyo before flying back to YYZ.

We don’t need our bags in Hong Kong but we’re looking to do most of our shopping in Tokyo and Osaka. We were hoping to ship our bags to HND and pick them up on our layover day before flying back home.

I’m seeing on Yamato that they will hold the bags for 10 days, which is cutting it close with our plans. Is there a service that will hold our bags (hopefully at the airport) for longer? What would happen if we kept the bags with Yamato at their HND pickup location for > 10 days? We were also considering asking the hotel to hold them for 1-2 days prior to shipping to make the window work.

Has anyone else encountered the need for longer than normal bag storage / shipping and what worked best?

Thanks!