I The "solenoid" you mentioned should actually be a relay,
It probably is, since a solenoid IS a relay. "Solenoid" is simply any switching device that is controlled by an electromagnet. There are mechanical solenoids, hydraulic solenoids, air solenoids, and there are electrical solenoids. We
also call electrical solenoids by another name: "relays". There are big ones, small ones, and everything in between.
Don't get hung up on the two terms. What matters is what it does functionally.
TNMOUNTAINMAN, how to get you back to stock depends on what you have now. There is more than one way to put in a pushbutton, and some of them are pretty simple and can co-exist with the stock system. Others are a hack job that makes a huge mess out of the stock system. If yours was done the simple way, restoring stock could be as simple as buying a new controller card and plugging it in. OR, it could be nasty.
Can you take some pictures and post them? Especially the Ford solenoid? If we can see what you have, we can point you in the right direction.