Sounds like a good proposed schedule to me.

As has been mentioned, stay wherever you want in Singapore and just take a cab to the relevant bus terminal the next morning. Cabs are relatively cheap and easy enough to find for most of the day (save when it's raining or during the rush hour).