Yes i have noticed that it`s hard to get parts. From manufactor no luck. We did ask`t from yamaha`s factory. No luck..
Did some research and in Suzuki Djebel 250 (at least 2005 model) has the same light whitch was used in older Raids, like mine. But it realy didn`t help, still hard to get. Even on ebay no one is sellig... Trying to keep eyes open.
So today we had some time and we used Yamahas referense numbers to find the part and the XJR400R has samekind. Not the same but close enough, so it`s use full.