It seems to me that there could be a gap in the market for someone willing & able to offer a headlight unit exchange / overhaul service. You could take a standard unit, open it up, swap out the old shell for the new carbon fibre one and carry out a Xenon bulb upgrade, reassemble et voila.
I'm not volunteering sadly, I really am all fingers and thumbs, but would certainly be interested if someone knows someone. It would certainly put an end to the problems of the vinyl lifting inside the units which some of us have suffered from.