Update at last!
Standard lights:

Nice LED lights:

Well happy 
Just need bulbs to come for them (chrome indicators & fog) then my subs can go back in 
Forgot, sorted out the gaitor a while ago:

Just need to swap the collars over to tidy it up, but I can't find my allen keys!