Very interesting pictures, Jeroen. Two things jump out for me, (a.) the very obvious poor beam pattern with the HIDs (presumably the result of the light source being more dispersed than in the halogen bulb), and (b.) the disappointing beam pattern in the Autopal lights - there's no raised beam on the nearside at all. With that in mind, would the Autopal lights actually pass your MoT test?
MOY has a pair of NOS Hella rectangular reflector/lens units, with pretty ordinary H4 halogen bulbs** and the beam pattern is far better than that Autopal unit.
** annoyingly the Hellas have the large diameter mounting ring for P45 H4 bulbs, so my large collection of P43t H4 bulbs (smaller diameter centre, three lugs sticking out around the diameter) remains unused and I had to buy more bulbs. Grrr...!
I did wonder about getting LED H4 bulbs (partly for the 'cold' white light, and partly for the reduction in current going through the column switch), but the LED bulbs' light source is more dispersed than the filament of the halogens, so I suspect the pattern would be comparable with those HID pictures!
Guess I should just stir my stumps enough to fit relays after all...