I would check all the ground wires. If any power windows, door locks, alarm have problems check the wiring harness in the drivers door jamb first. Every ZJ my girlfriend and I have owned (4) has had a broken wire in the drivers door wiring harness. Sometimes in the passenger door as well.
Water pumps seem to go every few years. I carry a spare crank position sensor in my glove box, but have never had to use it yet....... A long list of things documented on this board.
94 ZJ,4.0, AX15, NP231