In the end I've decided to chill out in Singapore for the night before moving on given the uncertainty over hand luggage allowance, let alone flight delays. In addition, Singapore has many hotel options where I can use my points/free nights, along with ease of dining and shopping, why not spend a night here, relax, and enjoy.