Pass on the VW. Just don't touch it. It is an unknown of how long localities will allow and unfixed version to be on the road and if the fix will be kind to the longevity as some have mentioned.
If you need something fuel efficient and comfortable, just buy a Prius... or a Volt.
You can do what my wife and I did. Just go ahead and live in DC and walk (transit is out right now I know). We have one car (A 09 Fit Sport too) and she had a <1mile walk to work and I would do whatever (normally the bus, Metro, occasionally drive). Yeah, it was "expensive" (she worked at Georgetown) in some ways but worth it not to have a commute for her and after doing the cost of transport vs housing cost, it was a wash.
If you need something fuel efficient and comfortable, just buy a Prius... or a Volt.
You can do what my wife and I did. Just go ahead and live in DC and walk (transit is out right now I know). We have one car (A 09 Fit Sport too) and she had a <1mile walk to work and I would do whatever (normally the bus, Metro, occasionally drive). Yeah, it was "expensive" (she worked at Georgetown) in some ways but worth it not to have a commute for her and after doing the cost of transport vs housing cost, it was a wash.