Replace Golf Mk 7 headlamp lenses

[ForestPct]

The headlamps (Bi-Xenon type) on my VW Golf Mark 7 work fine but the lenses are extremely faded and scratched. I have attempted restoring them but not successful. A number of on-line stores (EBay, Amazon etc) list replacement lenses for sale and I would like to try using these before I resort to buying complete (and expensive) headlamp units. I know the lenses are sealed into the headlamp body using butyl sealant and have viewed a couple of YouTube videos which demonstrate how to remove/replace lenses by heating the complete headlamp unit in an oven to soften the seal. Can anyone provide their experience (good and bad!) of doing this on a Golf Mk7 and any tips? Tx