Russell,
I also have a 350 , Long water pump an still had to use a spacer behind the fan blade to get it to the recomended 3/4" from the radiator, I have no overheat issues.
If all tests prove ok an ya still gettin HOT ...I would try a long water pump and get your fan closer.
Just my 2 pennies
Tim