Just so we're clear, I think the right strategy for anyone who could reasonably expect to be targeted (journalists, certain types of researchers, people with funny names, those who've sent mean tweets about the POTUS, ...) is to avoid carrying sensitive data when crossing borders.

What I think all US citizens should do is use whole disk encryption (but everyone should do that), and refuse to comply with requests to provide their passwords, even at the risk of missing flights / losing equipment / spending a day in a room talking to unfriendly people. Frankly, this is just an egregious and pointless violation of our 4th amendment rights.