I ended up going with this fan:
http://www.thehoffmangroup.com/autoloc/details.lasso?itemid=ZFU16S
Been running it now for about a month. Survived 7 hard and hot wheeling days in Moab. It fits better than my old efan and pulls nearly 3 times the air. During long, steep climbs the motor will still get a little hot but the new fan keeps it a good 10-15 degrees lower that the old one did pretty much all the time.
Trans temp also was really cool out on the trail. Most of the time stayed at 160 and peaked at 190 only a couple of times.
Also this fan is much quiter than my old fan. I've been really impressed so far.