Here's a better picture of the water pump that is currently mounted on the block.
The goal is to get the truck running first and then to install the right water pump and the original radiator. I managed to get hold of the original radiator a while back, but still have to find out if it leaks too.