I found this recall on my YJ it may be what you have going on also
Recall date: Not reported Units potentially affected: 100,000 NHTSA campaign number: 93V083000 Defective part or component: ELECTRICAL SYSTEM:IGNITION:SWITCH
Description: SALT CORROSION...
Have you checked out either of these sites 4Wheel Drive Hardware or Quadratec. They are the first place I start looking when I need anything for my Jeep.