The factory fan wiring is conservatively good for a 30A fan load, the only weak point seems to be the fan relay and PCB traces in the IRCM, but this can be fixed by carefully scraping the PCB traces down to bare Copper and soldering some solid Copper wire along the traces to beef them up - done this a few times.
If you decide to fix the factory fan wiring, use no less than 10 gauge stranded Copper, use uninsulated crimp sleeves, solder it after crimping and heat shrink or otherwise insulate the connection. Crimping alone is not sufficient for this gauge wire and current draw, and it's about impossible to make a gas-tight crimp on old wire that's built up some corrosion and started to work-harden - use some good rosin flux and solder it.
It wouldn't hurt to add a hefty in-line fuse to prevent a future meltdown.
If you want a dash fan switch, find the HEDF trigger wire from EEC to the IRCM and simply take it to ground.