Additional thoughts...
Secure the border with the military.
Send all Homeland officers currently tasked with “border protection” into a task force with internal (US) duties.
One time statement to self-report to the border or be subject to detainment and deportation.
(That mechanism already exists and doesn’t need court review.)
BP personal memory, photos and fingerprints on file with ICE/BP.
.