So I decided to get off me arse and install these new headlights this morning. Had to go up to the farm at 3am this morning, and the headlights really are crap.
So, since I have had these Narva units (goes and looks up thread.......) march 2014... Got stuck in as soon as I got back.
Couldn't get the grill off, and this thread was number 1 on the google parade, but no pics, and a thread is worthless without pics, so:
Grill retainer is the 3 screws mentioned above, and these 2 clips, 1 above and 1 below, the headlight unit.

The park globe and the indicator globes are both a 1/4 turn to remove, and the Narva kit came with new park wedges, so I put them in as well.

Even in daylight, the improvement is obvious.
Now just gotta get a brighteyes kit to finish it all off....