Unless money isn’t an issue I would go with depo headlights. They look like OEM and lots of people have them. You will need to do some coding. Do a google search and there are lots of info.
https://www.uniquestyleracings.com/s...013?search=f30
https://f30.bimmerpost.com/forums/sh....php?t=1593452