I suspect the CPS from what you said also about the tacho, the connector pins often loose there grip, again the wiggle test would confirm this.

Martin