I got my short water pump from Patrick's in Casa Grande, Arizona.
I used a fan off a '60 car 235. That fan blade has more pitch to it and draws more air than the older style fans. I had to use a .75" fan spacer and moved the radiator forward .75". For the purists that don't like to more the radiator forward, .75" is hardly noticeable. I can idle ona 90 degree day without going over 180-185 degrees. I've been running this set up for 12 yrs. as a daily work truck.