rad and fan!
what ever you do may I suggest if you are going to install an electric fan try not to use the plastic pull thru push pins that come with the fan. Instead make a frame that mounts the fan to the top and bottom rails of the rad. The problem with the pull thru clips is that the fan will vibrate and eventually rip your fins and tubes apart. Also use a shroud with your set up. If you can't make the stock one fit you can buy aftermarket aluminium ones from Jegs or other places like that.
my 2 cents!