Headlight switch problems... need advice

Headlights will come on, but the running lights will not. If I back the switch just a little bit off from full headlight on then the running lights will come on, but not when in the running light position. If I hit a bump in the road when I have them jimmied on then the headlights will remain on, but the running lights will cut off.

Is it time for a new switch? Or can I buy replacement internals from Ford for less than $32.00?

I am going to order (I think):

CJponyparts: Headlight Assembly Switch: SW2106 87-93 GT $31.95
Just to be safe, Switch Repair Harness: HW1922 87-93 GT $14.00

But 50resto has the same switch: #SW2106 $59.95

Too bad it will take a week to get herewith CJs, but I am not paying twice as much at 50resto plus sales tax.

I bought both of the above mentioned from CJs, the switch was actually $39, but the total for the switch and harnesses shipped, was just about equal to the switch alone had I bought through 50resto. Hopefully they will arrive before the end of the week, headlights are nice to have.

Fixed the problem...but need advice on the new wires...

I ordered the part from CJs, it took a while because it was not in stock, but no more flickering. I have 2 tests tomorrow so I don't have time to install the new wire harness, but it will be installed this weekend.

Should I use the crimp connectors, or should I bust out the soldering iron, and twist and solder all the wires?

These carry some current, and I want to do it right, what do you reccomend?

I rarely use the fogs, so I did not run a relay. I just used crimp connectors. It worked fine. Now I am ready for something else to fail on my car. Happens at least once a month...