I had basically the same problem on my 2003.? I recently repainted my bumpers with Raptor 2-part paint from Go-Westy and discovered that the passenger side fog light was broken off at the inside mounting.? The glass Lense had separated and was rattling against the bumper.? I ended up buying an aftermarket set of LED fog lights from eBay in Britian.? Had to put on new wire ends and dump the VW 2 pin connectors.? I'm not crazy about the fitment (They are plastic and just screw into the inside bumper) but the light from these is terrific!? I'm starting to think that checking anything lower than knee level might automatically become a project.
Bob H