Yes, this is what I did as well. It takes some finagling and thinking about the wiring, but it's a lot longer lived solution!I've heard good things about the solid state replacement setup that Warn offers for winches with solenoids. Ain't cheap but supposedly bullet proof.
Warn Replacement Contactors 98381