Never travel direct; never use a credit card; never book a flight to eventual destination ...
Never travel direct (Nick Leeson and CHOY, Hon-Tim); never use a credit card (the FBI can have real time displays in their offices); never book a flight to eventual destination (far better to fly to Canada on a return ticket and then buy a new ticket, preferably from another airport and NOT Westbound, either). Stopping over in the UK is not advised (password or 4 years) but France is OK.
The computers and hard drives could have been shipped to a friend, or Chinese restaurant in YYZ.
Put TOR and PGP on your computer and put real hot files on waterproof SD chips, wrap them in a condom and swallow. Better still, compress the files and visit an InterNet cafe. Messages are best passed through travel web sites - just like drug dealers do.
And if anyone asks what in your bag, say nothing and just let them look.
Obviously this was not a government prank, the Chinese are experienced at this sort of thing.
P.S. Taking the SIM from your telephone makes it impossible for airport data sniffers to work. And now they have to get search warrants.
Today's word is TSA - to keep those computers humming.