I think Border Patrol and Coast Guard should be rolled together and comprehensively joined with a more quasi-mil aspect rather than (or alongside) LEO.
LEO is (often) the wrong set of tools for border protection. It has it's place, I suppose, But sending LEOs against organized and often militarized drug lords affords no utility. As Armed Forces extension, it would have more effect. Grow another branch.