Radiator/ Electric fan combination?

I'm going to be replacing the radiator on my TJ that has a 2.5L 4 banger. Does anyone have a radiator and or electric fan suggestions? My dad went by 4 Wheel Drive Parts they suggested an all aluminum radiator with an electric fan. $1600 is a bit much I think. Not to mention $270 of that was labor.

http://www.quadratec.com/products/17800_3001_07.htm

http://www.ebay.com/itm/New-2-Row-w-o-EOC-w-TOC-All-Aluminum-Radiator-For-2-4-2-5-4-0-4-2-L4-L6-GAS-AT-/290690112456?pt=Motors_Car_Truck_Parts_Accessories&fits=Model%3AWrangler|Year%3A2000&hash=item43ae7b1bc8&vxp=mtr


^ its what I got. Works good so far.

Thanks again! You are a wealth of information.