Combine the departments/agencies responsible for border security and split those from the megalithic monstrocity that is DHS. Combine the functions of CBP officers at Ports of Entry and Border Patrol Agents between the Ports of Entry. These functions should be the Law Enforcement functions of Immigration and and the strictly Customs revenue generating/inspection should be reverted back to the Department of the Treasury from whence they came. Also add into the mix Iiimgration and Customs Enforcement, TSA at the airports, and those National Guard assigned to Border Security. All can be trained at a centeral site instead of the various sites they are currently trained at.
The remaining none border security positions can be reverted to the departments they came from.