I would take the spacebed upgrade if you can.
This summer i flew EWR-SIN in raffles and when I arrived in singapore i was well rested and spent all day browsing around singapore before going on another flight to MLE the same night.
I have also done the exec economy , and its not a bad deal.
I dont know how the routing change would affect the upgrade.
Im sure someone else here can answer that.