Hey nice work. I've got a 1997 C230 and had to replace the left and right headlight lenses. Maybe mine's different, but it was really not that difficulut. If I remember correctly, on the right side, I got all the screws out so the whole assembly was essentially free from the car. Poping the clips that hold on the lenses is the key to this job. While the assembly is free from the car, this is quite easy. On the left side, though, there was at least one screw that I just could not find. While I could move the assembly around a bit, it was not all the way free from the car. It made poping the clips harder but doable. I did not have to take apart all the other things that you mentioned. I'm sure you did it the right way, but my rig job was easy and it worked just fine.

__________________
Michael

1988 300 SL (5 Speed)
1994 E320 Wagon
1997 C230