I just got rid of my 2012 TDI Jetta. Actually was a nice little car to drive around, but now that we have a 1 year old kid and all the stuff that entails hauling around, "little" became the operative word there. Those TDI engines are surprisingly peppy, but I wouldn't want to own one out of warranty.
I always liked rubbing the fact that my TDI actually had a similar carbon footprint to a Prius (once you account for the production and disposal of the batteries), and was a hell of a lot more fun to drive. Maybe that wasn't nearly as true as consumers were lead to believe though. I guess if you wanted a diesel car finding one of the affected years might be a good option, as you know they aren't nerfing performance to pass emissions.