Well the simple answer is SIN for the run and BKK for the town and YOU CAN DO BOTH!!!!
I'm planning a sin run because the run is more interesting. Planning was to sfo to lax, to hnl to hong kong to sin, but once i get to sin, I'll take a swiss air flight to bangkok which is $123 round trip.
Singapore has Raffles, which is a wonderful place for tea, and a few other things, but Singapore only dates back to 1850 or so if i remember. bangkok is much older, much cheaper, much more exotic