Radiator core upgrade

You can't ( never say can't ) go wrong with OE parts
I agree. I think a core upgrade and the shroud will do the trick.