Personally, I'm not going to let them deter me from the wonders of international travel. I've had a mix of experiences with CBP from not asking a thing to being needlessly sent to secondary. Both times I survived.
When I'm standing around an arrivals hall and looking at all the others in the unwashed masses I'm inspired. If they can do it, by golly I can do it too!!!