Seems pretty clear, though for the first MOT at least I may well go via the dealer and let him do the explaining to the test station.
Interesting that the section on headlamps contains the lines;
"Vehicles equipped with High Intensity Discharge
(HID) or LED dipped beam headlamps may be fitted
with headlamp washers and a suspension or
headlamp self levelling system.
Where such systems are fitted, they must work"
To me that sounds like it is permitted (at least for MOT purposes) to convert the lights to HID or LED without fitting all the washing and levelling paraphernalia that manufacturers have to fit.
