Shame this whole saga has happened.
Having read through all your posts and the various recommendations from multiple garages, I think you should try to stay calm and sleep on this for a few nights and not do anything rash. That is if you can afford to have the car out of action for a bit longer.
I say this because I feel you don't trust the tuner that mapped the car recently but now tempted to go back for the convenience. It is not convenient if they f it up again.
I am not sure where you are, but I am pretty sure there will be competent VAG specialists with good reputation not too far where you are unless you live in the sticks like the faroe islands!
I am inline with the other members here and say you'd really want to go for an upgraded turbo (non stock) regardless of what map you plan on putting on after the fix. More so if you want stage 1 power. And if finances allow, since turbo is gonna be out, do the downpipe at the same time.