Hello,
I can recommned Peter Schmid in Burlingame California.
http://www.peterschmid.com
They will fix your old one or do a swap, two year no mileage warranty!
I have been to the location myself and had my 1989/300ce done there. Same problem as yours, very common.
Brian
calif