Congratulations
I agree that fixing it yourself is much more satisfying.
Here's another thought on interior light. I plan to use reading lights from a w126 or w116 to help illuminate the rear seat better since the wagons only get good light in the front and the back hatch area.
I also replaced the stock bulbs with LEDs from LEDlight.com. I've posted a few times with direct links to all the bulbs you would need and even posted a pic of my cluster with the LEDs installed if you're interested.