My S600 throws off an intermittent fault for the RH door mirror signal.

It looks to me like there's 9 LED lights in the turn signal in the door mirror (see attached pic). On the LH side of the car, 6 of the LED appear to be working. On the RH side only 3 appear to be working (and perhaps intermittently).

In looking at replacement signal assemblies available on the web it seems there's a couple different versions. The version on my car has the nine LED's in a compact square arrangement (pic 1). It looks hard to find this as a replacement. What's readily available is a different configuration with the LED's spread across the signal (pic 2). I'd like to keep things original and not put junk on my car. Anybody have any experience with this one before?

Thanks in advance for any help.