1st , do you have all the fillers? the X fillers, the rubberized masticated fillers at the bottom sides of radiator and the lower baffle? if so try the waterpump modification.... its on some of the stuff Kelly listed above ,but here`s a compilation... I am about to do this myself next two weeks... web page I think it will work!
