What we need is "The Commonwealth of Columbia".

Create a new status for DC, intermediate between a state and a district.

The Commonwealth would have a voting Representative in the House, and one voting Senator in the US Senate.

To resolve Puerto Rico's situation, that territory's status would also be upgraded along with DC's. Puerto Rico would be given a full-fledged voting House member plus a single U.S. Senator.

Citizens in both Commonwealths would be allowed to vote in the general election for president. Both Commonwealths would have electoral votes in accordance with their populations.

This is an idea for a "historic compromise"... more realistic than Statehood. It is a "shared status" with power shared between 2 entities -- the federal government and the people of the Commonwealth.