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).
Just food for thought prior to doing anything. Although I do recognise that a 'well written' map would be slightly superior to a tuning box, I don't think the difference is worth the risk.