It could be the pump or elbow. Pressure testing the system should help you more accurately pinpoint it. Get the aluminum elbows instead of the plastic ones. And if it is the water pump I'd probably change the elbows anyway.