Ugh the 7M CPS is horrible for this. Unfortunetaly, the wires themselves get crispy and breakable, so if you aren't careful you will have to trim and/or extend your harness when you try to install new connectors.
On a side note, we were installing new suspension on a buddies car, and the TEMS connectors look VERY similar to the CPS connector. Didn't check if it fit, but it might be worth a try.