Thanks for all the help everyone, I've decided it's time to get some work done on the car now anyway, so when it goes in a couple of weeks, they can sort the electrical problems as well as rebuilding everything else.