Personally I would delete, also the DPF too, especially if you want the performance and gets rid of any future problems for good.
Thanks Chris, don't think it will happen for a while but I keep looking at Q7 6 pots lately