You are most likely on the correct path with the CPS ( or CPS connector ).
I don't usually do CPS, but when I do, I prefer Bosch.
Kidding, make sure you get a Bosch CPS.