You need a shroud. And a 7 blade fan would help. That is why you had an improvement when you moved the fan closer to the radiator and changed from a 4?? to a 5 blade fan. You had a 4 blade fan on it before?
Stock 340's had a shroud and a 7 blade fan.