mate yes you can. If you take your time, use the right stuff ( cut and polish, wet and dry sandpapers etc ) finishing it off with polish, it will appear as good as new. Give it a proper go and if it doesnt make you happy then i guess u can replace the new one with an old one! give it a go!
The two light is different front the pre-facelift and facelift models, facelift model has 3 light in them, low beam, high beam, parkers. And pre-facelift (mine) just has high and low beam.
That seems really weird, but yeah, some pic would be good for others to confirm. But i guess u cant get any pic since the car isnt with you, i had the same feelin you got before, when i was fixin my gearbox, took 2month -_- but once u get the car back u will be SOOOOO happy ^^ think of it that way
well the only way i can think of to confirming the light is ask them does it have 3 light or 2 light? If its 2 then its their fault for getting a different version headlight, but if it does have 3 then the best thing is just to get there and take so pics so ppl here can help you unless u want to find/buy another set of headlight.
u will be SOOOOO happy ^^ think of it that way