I've opted to replace my 2013 TDI with a 2016 1.8T. Haven't driven it yet but the year end pricing was too good to pass up.
Sheehy (linked earlier in the thread) plays games with their pricing ($500 trade in credit, must take their financing at triple the rate of my bank..) but the DC area does have competitive pricing.
Mine ended up being stickered at $30,880. Price came in at $23,850 minus the $1500 cash back for Labor Day. Buy back is $21,500 so basically I'm out about a $1000 plus the taxes, freight, and doc fee. Out the door at $25K. $3500 out of pocket.
This is the 1.8T SE with technology package with the headlight upgrade. Significantly more features than my TDI (sunroof, nav, collision avoidance, backup camera, heated rear seats, modern audio system, KESSY, ...) for just a little more money. So I pulled the trigger.
Will probably park the new one until the buybacks in November and drive the TDI in the meantime.