Probley a good idea to change out everything while its open. You consider changing the main seal ?
I'm still thinking on what to do on my GT... right now the heads are needing a valve job, so things are moving slow(er).
Good luck with those electrical gremlins.