Tomorrow I am going down to see what he can do. I have all the parts, and yesterday the car was just about in pieces in 10 minutes, so it is not a huge job. It has come to a point where if I did it, I would cause more damage than good.
I do have most, if not all of my components for my water heater. I am going to measure out the hoses and mock it up and try a test with the pump using a bucket of water.