I read not to long ago about just buying EZ's ignition switch and headlight switch. Both are GM based but man the plug and play with those make it really nice. If I were to do it again, that is what I would do.
Buy new headlight pigtails from your local NAPA, Pep Boys, etc...