We did out and back to NZ chaning planes in SYD business class in April and like the OP had to do it as one trip with no time to explore stopover cities. We went out via SIN and back via BKK. Without a doubt SIN was the nicer stop over, much better organised airport and lounge. Walk was less in SIN and signage was much clearer