David,
I don't know if you have replaced the city lights or parking bulbs yet, but I just had the same problem and wanted to share my solution. I have the Litronic headlight system which requires an H 6 W according to the owners manual. These bulbs are pretty hard to find. The other light system uses W 5 W or a wedge bulb. I wanted the bulb to match the Xenon better so I found LED bulbs that replace the regular bulbs. Not an exact match, but much closer than the original setup. The LED's have a little more of a blue hue than the Xenons, but not really noticeable when all lights are on. Here are some pictures before and after I switched out. Take a look, let me know what you think.
The link to the website is here:
http://www.ultraleds.co.uk/advanced_search_result.php?keywords=h6w&osCsidx=5f78695993184f14fca2431857a21d27&x=5&y=11
I chose the bulbs listed: UH6WW+ H6W BAX9 - 9mm BC 6 Leds White Offset Pins (Pair)Wide Ang