I just payed another visit to the parts store to see if I could modify the long shaft pump, but it seems unlikely.
The hub and the 4 holes are different from my existing pump. Now I am really baffled. It appears that my existing pump was modified, so now I have no idea what I have. If I order a short shaft pump from Patricks, will the hub match up with my pulley and fan, and line up with the other pulleys.