Since you're in NYC you should go this route:
http://www.m3post.com/forums/showthread.php?t=723199
Some of the best headlight work I have seen on this forum. With the way headlight/front bumper lighting is evolving (Audi really leading the way) the ring replacement seems the best route.
If somebody knows a shop in the SD area that can do this kind of headlight work please let me know!