Glad you got it in the end.
Me and my brother once spent a month trying to figure out an electrical problem on his 93 Mercedes. After all the searching, swearing and pain it turned out to be a cable with a bad connection (it was sitting there in plain sight the whole time).. DOH.