OK.
I can't decide whether I'm extremely happy or just a complete idiot.
I'll go with the happy, this has just been messing with my head for too long.
I have found the problem.
I did everything that was suggested including touching up the electrical connections, although I didn't end up touching...