I had a 1980 cj5. Kept having same issue. After changing almost everything I changed the solenoid on the fender well and didn't have anymore issue. Also changed ground and all power wires. Was told the solenoid will stick closed and draw power.
I have a 91 yj with four banger. It currently
Has manual steering which sucks on trail rides. Will a steering box from a Cherokee work on yj ? If so what years to look for ?