replacing windscreen washer pump

Recently took my van in for MOT. On checking things like light bulbs one more time before handing it over, I found that the washer pump was not working. Left the van with them to replace the pump before MOT. This was done and MOT passed. However the parts labour and VAT came to over £200. They had to remove the driver side light unit to gain access. IF it goes again is there a method of gaining access without removing the headlight unit, which I suppose that I could do but then probably would need realigning afterwards anyway. Thanks.

Even need to remove headlight unit ( and trim) to replace bulbs so don't think so. However I replaced two headlight bulbs a couple of weeks ago in under 45 minutes so should only take garage under half an hour to remove and replace trim and headlight unit... Total of six bolts and a few clips

Thanks for that. One of the concerns I have relates to the alignment of the headlight after replacement. Will the light unit automatically return to its original position?

It is held in place by one clip at rear and three bolts, one on top and two at bottom, there is some adjustment possible with the bolts, by closing bonnet lid and checking spacing I have managed to reseat unit with no change in alignment.

Thanks for that.