Don't know about the stock-ish top tank look but I've been using an aluminum 3 core radiator I bought from a seller using Amazon as his sales platform and an aluminum shroud/Spal 2070 cfm fan & adjustable thermostat combination made by Old Air Products (in Ft. Worth) and it has been excellent. You can spend a lot more for a radiator, but I don't know why you would.
https://www.oldairproducts.com/product/50-205185-16shp-universal-fit-fan-shroud-kit Personally, I'd get rid of that stock fan...especially if you're at all considering adding A/C. I did and am very happy. The water pump should last longer without having to spin a crude and probably imbalanced fan around and it is quieter and has less vibration. As you know we have very hot summers and often slow moving traffic here in DFW.