There are other aftermarket tuners besides APR.
I expect the feds already know about them, and will require fixes which attempt to lock out these types of workarounds.
I just got a VW certified previous owned TDI on Sept. 7th, just 11 days before the STHF.
My plan at this time is to simply keep the vehicle, enjoy great mileage, stay away from the VW dealer unless absolutely necessary.
And probably remove the TDI insignia, since I don’t need to announce to the world, that I am a gross polluter in some eyes.