From what I've seen, most people tend to go for the aftermarket projector headlights as to replace with OEM required coding and adopters for the wiring, I believe.
As for the number plate bulbs I bought ones similar to these eBay: 320939963422
They're a complete replacement part so no messing with bulbs, mine have been fine and had them in since June