How about utilizing TWOV twice in the same trip? We're planning on flying into PVG, stay about 30 hours then fly to Nanning to board the train to Hanoi. We'll fly from Hanoi back to PVG, stay overnight and fly out the next evening after approx. 36 hours the second time.