Aree. I am not sure if this is applicable in Thailand, but you can explore.
If my memories is still right, maybe you can look into the ‘Temporary import and re-export” customs clearance to minimize storage charges. With this type of customs clearance, we may not require to pay duty import. If we must pay for the goods being delivered, the duty import will be refunded after the goods re-export back S’pore.