Hi David,
Not sure if you have sourced a lock yet but I've come across the same symptoms as yourself and found this site if this helps:
8L2837016B AUDI / VOLKSWAGEN ➤ Buy online now Door lock with door contact switch driver side at Cars245
FIRST10 also offers 10% off on checkout.
Thanks
Patrick