Put the front end back together (post-painting) and found that the dipped headlights were on permanently. So got to it with the multimeter and traced the fault to the dim-dip relay, which seems to have done the Lucas thing and fail short-circuit. So I've disconnected it and now have normal headlights.
One of these days I might just pull all the wiring out and start from scratch...