Re: ensure that innocent American citizens are never forced to hand over their ...
To be fair, many people in the US find the CBP's treatment of non-US-citizens outrageous, or at least exceptional. But the resources to fight the DHS are limited. The ACLU routinely objects to infringements of civil rights for citizens and non-citizens alike, but they have to pick their battles. Similarly, people like Ed Markey1 have only a certain amount of political capital and attention from the press to use as a bully pulpit.
The present Federal administration is not going to make any consideration whatsoever for people who aren't US citizens. They're occasionally forced into a bit of a retreat by the courts, but they don't give a damn about the rights of foreigners.
1Who's on the side of the angels for this issue, but is hardly a saint, any more than any other member of Congress. He was one of the driving forces behind the idiotic extension of Daylight Saving Time, for example, based on pseudoscientific evidence from a highly flawed and long-outdated study conducted by the Department of Transportation.