Most stuff on Amazon is made in China anyways. Might as well order directly from Aliexpress or the producer's website. Exactly the same items, but without the American middleman.
There's definitely going to be some sort of EU-China rapprochement now. Not that China is less oppressive - they remain more oppressive, and I wouldn't like to, say, get caught with weed going into China. But they're much less loudly annoying about it.
(another one to watch out for: opiate painkillers in your hand luggage into Middle Eastern states, including Dubai.)