If i'm not mistaken VW Racing use Superchips
What about using Superchips?
Their Bluefin device lets you do it all without the visit to some crappy fitting place complete with a dodgy bloke and laptop?
You can install and uninstall yourself too - not a capped re-map to simulate standard power either, you actually swap std map vs Superchips map in and out, with both being held in the Bluefin unit.
They also provide a warranty on anything VAG won't cover, should something go wrong. Although, how watertight this is, I don't know...but it's more than CC or REVO offer.
Also, they quote real world power gains - on 95 octane fuel. So basically the least you will get...rather than the highest they ever saw, on a car running 98.99 octane fuel, and with a standard car making 25 BHP more than VW claim (yeah, right) to give their output of 275 BHP.
Surely an option?