I think Metro hit bottom a couple years ago and is on the way back up. Dedicated funding (finally!) will enable steady improvement. If Amazon comes to town and uses their clout to push for better transportation, that will on accelerate things.
It's already had an impact. The stalled metro stop between DCA and Braddock (next to one of the potential build sites) magically started moving forward again a few months ago.