Still split between LED Xenon and Standard .
I will have to order a new BCM either way unless I do your high beam shutter mod.

What did you do to get the high beam to work ?
If I buy the new BCM I might as well go for the LED Xenons.
I have ordered the cornering modules of eBay, not sure if they are the right ones but they can be returned if not.
I thought I might as well fit the module as it is under the light and would mean bumper off again if I decided to later.
I will leave the self levelling until later on.
Looks like I am in for a bit of a wait for the bulb adaptors as Steve has found out.