Had a similar prob with my old 89 S2. Clicking noise turned out to be the amal valve, i unplugged it and it stopped clicking