Stay with WTA. Get something to use as a larger heat exchange (I use a really big oil cooler as in my the photos on my sig. It tripled my capacity and is dual core), get a higher flow pump for the IC (I used a rousch racing 240 gph off ebay), and maybe a resevoir to allow for more coolant capacity. Rewire your pump for constant run.
Don't fall victim to the big FMIC bragging-rights crap. Many of the big horsepower GT-Fours and MR-2s use aftermarket WTA.
Also, keeping your factory fogs keeps one of the primary things about your car that tells the world it is an Alltrac - a rare car with a real pedigree and not some late-comer cookie cutter Honda, Sub or DSM.