I just recently had to replace the water heater on my 98 400 EC. To remove the water heater they had to remove the manifold and riser so I decided to relocate the heater, now at least I can service it now
Do you have the bulb # ? Try Amazon or 1000bulbs.com you will need the number on the bulb. I recommend leaving the halogen they are brighter especially for running lights