Basically I think only the Capitol, Mall, federal buildings within a small circle and White House should be DC, the residential and commercial portion should be turned back to Maryland
Maryland would get to count all of DC’s population to get more electoral votes but the MD senators probably couldn’t get worse. But I don’t think such an amendment would pass anyway unless real estate speculators pushed it.