Did you ever go get the charging system tested out? I'd try to nail electrical gremlins out before you upgrade , could be more of a headache if the problem persist