http://www.scribd.com/doc/5115…95-YJ-FSM-Wiring-Diagrams
Here's a copy of the FSM wiring diagram. Your gonna have to get your hands dirty a bit.
First thing, I would do is find any and all wires the the PO had for random lights, dixie horn or other non essential stuff and eliminate them. You prob wont have much to fix after the BS is removed and you may only have to replace a few pig tails once you get to a real problem. I know Fitzgeralds has a few YJ's just chilling in the yard there, cut what you need and correctly splice in. If I had some free time I'd swing down to look it over but I'm booked solid with work and family till Mid July.