Reading this prompted me to have a look this easy mod - I went for these from eBay.
https://www.ebay.co.uk/itm/140471578326Received them today and fitted them dead easy - definitely take out the trim and the light together which made getting the bulb out really easy. With these bulbs have had no errors.
I bought these before I knew VW even did a replacement light - checked the SN and seems either it's out of stock or the cheapest is around £25 - I don't have access to a TPS. Very interesting the whole light is made in the UK, must be the only VW part I've seen with UK/GB markings on.