I have ended up changing my itinerary, spending only one night in Singapore with 9 hours between arrival and departure. So I'll most likely be sleeping at the in-airport hotel. I'll then try out the PH Melb for 3 nights to see if the service problems I experienced a few years ago have been ironed out.

Thanks for everyone's suggestions! Had I stayed in Singapore, I almost certainly would have gone with the FS, btw.