A tuner would be able to restore a stock map, The main dealers should be able to restore a stock map but I am not sure how much that would cost you and if there was any issues when the stock map was restored then it could get very expensive. I am surprised the MAF is still in place if the car is running MAFless . The idea of going MAFless is to remove the restriction and usually the turbos have been upgraded and the MAF can get maxed out.
It's possible the MAF is faulty and disconnecting it the car switches to Alpha N mapping so calculates airflow based on throttle position RPM and boost. In the NW area you could try contacting Rick at Unicorn Motor Developments in Stockport. He has mapped many of these over the years , unfortunately I am not sure if he still works on older cars.
https://www.facebook.com/UnicornMotorDevelopments
Awesome GTI may be able to help you out, they are in Manchester.
Specialist in performance parts for the VW Audi Seat Skoda Group cars. Interest free finance available on all car tuning parts and we have our fully equipped specialist workshop in Manchester.
www.awesomegti.com