this may sound crazy but since you have a spare GM pump, you could install it with Y valves (one on the black water intake, one on the water supply side) and a switch. that woudl allow you to switch pumps at any time when that happens. also, it will empty most of the line making the job less unpleasant.