Factory shroud, Spal fan link below. The controller is also from Spal, but is not made anymore. I have been buying them as they come up on ebay and Craigslist but I included a link to them as well.
http://www.a1electric.com/Merchant2/merchant.mvc?Screen=PROD&Store_Code=AEOS&Product_Code=30102803HO
http://www.speedwaymotors.com/Garage-Sale-Spal-Pulse-Width-Modulated-Fan-Controller,35700.html
I like the SPAL fans.... those 16 inch versions move some air (the high perf ones).
Be careful on the older spal fan controller...I had one for a while and it lasted for a few months and one day the smoke escaped and it would have had a meltdown had I not been there to disconnect the wiring. (We were testing it for operational control as we never could get it dependable as to turn on and turn off temp).
You may know but SPAL has a new fan controller out (but I'm not sure what fans that it supports) vs. amp draw.
SPAL is the best fan out there in my view on the aftermarket side.
Nice setup on the fan shroud integration....very cool.