Well, I'm going to do a 20-litre refill of the gearbox today using the following oil:
https://www.ebay.co.uk/itm/303081772419
I'm also going to use the Liqu Moly gearbox cleaner:
https://www.amazon.co.uk/Liqui-Moly-...c=1&th=1&psc=1 fists - once I have cycled through the process for 10 mins I'll fill and drain until the 20 litres is used up which should give me completely clean fluid in the box.
I'll then reset the fluid counter and adaptations and take the car for a drive and follow the adaptation process.
Wish me luck - I'll report back later