Radiator options

My question is very similar to http://www.dfwmiata.com/threads/21530-radiator-for-MSR. I'm looking for more opinions/options and to see if anything has changed since then.

My radiator failed a pressure test today, as well as the thermostat gasket (which I just replaced about 3 months ago ::Ban2:: ). I'm pretty much set on going FI in the future but haven't decided on how/what. I see that some radiators will limit my options regarding FI options. I want to go with the best option for what I end up with, but since I don't know what that will be, I have to settle with what's the best that gives me the most FI options. I definitely don't want to spend the money now only to find out I have to replace it once I decide how to FI. Given that, I think that eliminates the FM crossflow design. Looking at TDR, they like the PWR it doesn't like they have one for my year (97). I figure I'll replace the fans while I'm at it so ideally there shouldn't be a fitment issue with the new radiator and the FM stage 2 fan kit. Eventually this car will be tracked but right now it's just autocross for now.

As for the thermostat hosing/gasket leak, I'm a little stumped. I did have to clean up the surface of the housing from the previous gasket which refused to completely separate. I may have used an overly aggressive pad when cleaning it, but the result felt smooth to the touch.

Any advice is greatly appreciated, as usual!