I went with the short shaft water pump with a 7 inch pulley. While the motor is out, pull the radiator out, have it checked out and repaired if need be and convert it to a pressure system and use a 4 lb. cap. While they have it out, change the tank outlet to the same diameter of the thermostat housing. You may need to bend the fan slightly to clear the crank pulley.
