Yes, as far as congressional representation is concerned, make the District of Columbia part of Maryland again, and they can vote in Maryland for members of Congress.
A ten-year old kid could draw the map lines...a 1 x 1 mile area to be fed-property, and the rest goes to Maryland. Shuffle the mayor and city council into non-existence. Georgetown, Columbia Heights, Anacostia.....all should be their own city with a local mayor...coming under Maryland law. We could wrap this up in six weeks, without a lot of drama.