Personally if it was still under warranty I'd go for a tuning box over a remap (which I did on my 2014 GTI PP). If you wanted to get it remapped after the warranty has run out, simply sell the tuning box on.
Remember that even if flashed back to standard, as soon as VW plug your car in during a service, it will (in the majority of cases) flag your car as mapped (the dreaded and widely recognised 'TD1' flag) and invalidate a good portion of your warranty (engine and drivetrain mainly).
And recently we discussed how VAG now have a method to detect removed tuning boxes too and TD1 them...
Basically, if you tune it, expect warranty rejections if you claim for parts covered by warranty tuning violations.
Your car, your choice, but be informed.
I'm not going to start another debate on the matter but legally they can only refuse warranty on the part that has been modified so the ECU
I'm sorry but I think you're wrong - if you have modified the car (in this case remapping it) which causes other parts of the car to work outside of their specified design parameters (for instance, the turbo working harder to produce more boost) then does the manufacturer have the right to refuse warranty on those items too? Obviously they'd struggle if it was (for instance) a rear wheel bearing but you get the idea.
Also, whilst they
could see if a tuning box had previously been fitted, they've got to delve a lot deeper than the flash count/checksum that raises the TD1 flag.
That said, I'm mainly in agreement, even if the post looks otherwise

if you tune, expect to pay if related stuff goes wrong. I was in the same boat with suspension mods etc. prior to the warranty running out.