Maybe just put the US Marshals under the judiciary. It seems obvious that a Marshal who refuses to execute a warrant because his boss said not to should in turn be subject to contempt and arrested by a law-abiding Marshal. But in reality we’ll end up with the same issue that Congress has: no jail to hold people in.