Thanks Adam1222!
So it looks like it's easy. Just look for the CX/KA "side door" in transit, and have a printed copy of my itinerary, not just the e-ticket, in case somebody "official" needs to check something out.
OK - so we just have to decide if it's a weekend in Tokyo or Hong Kong. Life is full of tough choices...!