That should simplify things for you, though I would keep the CD engine and transmission together. I thought the newer 722.3 and .4 were available in all 123s by ‘81. I guess it was only the TD turbo.

Sixto
98 E320s sedan and wagon