Both are nice, but Singapore is lot better. Changi Airport is just great and try to get your itinerary with layover of more than 5-6 hours at Changi to enjoy free Singapore tour, no visa required. More at: http://www.changiairport.com/at-changi/leisure-indulgences/free-singapore-tour