A great city. I miss the the hawker stalls. One of the worlds great food cities.
Now on to diving. With all of the dredging and shipping the diving in Singapore isn't great. Look at the nearby islands in indonesia. I've dove Palau Tioman in Malasia, which was was good, but not great. PM me if you have any questions. Bali and the rest of Indonesia is close and cheap. Sipidan is also an option. The Philippines is also a possibility. I've dove most of the area, so let me me know if you have any questions.