I would switch to the daytime flight to beijing and spend a night there myself (I assume you only have 24 hours for the layover). I would also skip HK, and fly direct from icn to sin.