Have you checked Capital South (Orange/Blue/Silver Line)? It provides direct access to the northern part of Navy Yard via New Jersey Ave.

I use this all the time, as it saves me time than transferring at L'Efant to green line (Navy Yard/Ballpark Station) , and I live on the northern part of Navy yard near the Whole Foods.