Very nice to read. Been to SIN some times, but the first time I went, I did more or less the same. Liked the night safari a lot, but next time you need to see the bird parc.
Try to get a stopover in SIN with SQ and you will get most of the things you did for free and very good hotel rates.