I'm not an electrical person, but I would check grounds first, before throwing more parts at it. I bet 8 out of 10 electrical problems I've ever had stem from a bad ground. Even if it looks good, take it apart and scrape it down. In one of my CJ7s I had to take the entire dash apart and clean every connection due to water leaking through the cowl and windshield through the dash and making a mess of my connections.