I believe CDI was for both the 642 and 648 engines. If the 648 is what you want the late 05 and 06 models will have all the software updates. I purchased a early 05 last year and need to schedule the software updates soon. Not certain if icarsoft can read total current draw but it's useful to ensure the car doesn't have a parasitic drain after shutting the engine off. Good luck sounds like fun.

__________________
92 e300d2.5t
01 e320
05 cdi
85 chev c10