Aftermarket Fog Light ???

[EllowViper]

After motorboating my Viper around with the North/Central VCA gang this weekend, I discovered a cracked passenger fog light (I think it got hot and when I hit a few waves, it might have cracked....). I know some have done the 03-08 replacement "upgrade" to the Gen II, but has anyone found a good aftermarket replacement that is pretty much an OEM bolt-in?

 

[jasontiff]

I'm interested too. My passenger foglight housing has been cracked since I've had the car. The light works, but the blemish bugs me.