DOH! I WAS WRONG! originally I said "ok I checked and I definitely have the shorter pump ..."

I must have not had my contacts in or something I took another closer look with a light this time and the radiator has definitely been moved foward. They made some little angle brackets and mounted the radiator to the front of the stock channel. So I guess I DO have the longer waterpump because there is no way the fan would clear the radiator in the stock location.

oh well I am still learning