There is no reason D.C. should've ever been disenfranchised.
There's the core of D.C. w/ all the federal buildings, and the surrounding city, it all sits between two states.
So dump the city parts of D.C. into the states they lie in, and keep the core of D.C. separate.
Why does this have to be hard?