Suspected as much (wasn't sure if Taiwan counted as 'China' in the T&Cs
) — I think I'll adjust the itinerary and do the SIN-BKK-SIN-LHR-AMS leg all on the way back (with a night in a BKK) and go in Y class with my friend as it seems to be much cheaper/less strenuous to go to TPE via SIN. Not fully concerned about milking the most out of my TPs for this small segment.