Your iternary is packed and you are very knowledgeable about everything in Singpaore. Anyways, you seem like you have an idea where to go...

I am a certified local guide, but the perfectionist in me, says that Singapore does not have much in terms of sights.

IMHO, I will cancel the Chinatown night market, its very touristy. The nicer parts of Chinatown are in Keong Saik, The library bar, Teck Lim road, lotsa "cool" cafes and restaurants here now. And also Duxton hill.

You might wanna skip Changi Village cause its not very developed and rustic. Please add Gardens by The Bay (if you have not already been there), as it is new and good to walk around in evening.

A good place for fireworks is One Fullerton, besides Merlion. Check out Overeasy and the stretch of bars and cafes on the waterfront.

Ya Kun is all over town, so you wont need to purposely plan to get a Yan Kun.

The above are my two cents of sharing. You already know so much about Singapore! ^