I agree the easiest is to do the MAD change.
I did this earlier this year and the car has been very good and no electrical problems any more, as most of the electrical issues were under the dash, added cables, shorting, and the bulk head connector was showing signs of burning.
Mine was...