If you own a YJ, you need to own a multimeter. Exactly for things like this. Is more than likely your switch, but if there's a short somewhere causing the whole problem, you'll need a meter to chase it down. Even the really nice models aren't too expensive, I recommend picking one up, it'll pay for itself in saved headaches in no time. Good luck!
HONEYBADGER: Ford 302, NP435, Dana 20 twin stick, 8.8, facelift, paint. Constantly changing my mind....
>>>the single greatest investment you can make for your jeep is to buy a good welder, and learn how to use it<<<