Not sure about the change of your RPM sensor, but the RPM sensor on my autostart ram is a 4 wire sensor.
As far as thermocouple's dreamworks has them w/ the connector you need. The picture shows the "large" yellow connector, but they quit making that connector and have the servo style on them now. Tod said i could cut the servo connector off the thermocouple to install the big yellow connector, so i see no reason why you couldn't do just the opposite.
http://www.dreamworksrc.com/catalog/...roducts_id=530