There's also a number of German sites selling new lights at reasonable prices. PM me if you need more help.
As for the second foglight-you just need one fitted but it must be mounted on the left side of the car.
Oh and I believe the BFG rules have just changed-you now have 45 days to complete the process. Under the outgoing rules you actually had 60 days to complete the bfg test / lights but they kept the extra 30 days a secret!