It the ECM swap does not solve the CE light, look at the source for activating the light. Is the light grounding for some other reason. Relay driver( if it has one) etc...

Let me know what happens.

Ray Hinton Login to read more.