Growling from the water pump just got fixed. I wanted to put the factory fan back on but I didn't like the spacing and I couldn't get the bolts back in because of the offset with the radiator in the way. I also left the shorter bolts at pick and pull. So the metal fan is back on for now but I do have the fan and spacer for a later installment.
The long spacer made the plastic fan basically touch the radiator and the short spacer looked too distant. On second look it probably would have been fine.