Sounds like a good plan. Have never been to Divine's wine bar. Hopefully I make another trip one of these days.
First trip to Singapore in the 80s, pre-renovation Raffles was much nicer than in the 90s post rennovation. It lost its unique charm, and now looks like many other hotels.. What they now call the museum, is what the entire hotel looked like. I still have my cocktail napkin and swizzle stick documenting my Singapore Sling at the Long Bar.