Revamped cooling system

I think you're overthinking it. Your current temps are fine. I would add a shroud at most and leave off the electric fan.