Here we are before work started. The passenger side was fairly straightforward but the drivers' side was a struggle by comparison. It turned out that the light unit wasn't passing current so I ended up using one off the spares 1500 (lucky I had the smaller parts to hand) and it was working fine after that.