Cut PR loose and make DC part of Maryland. <
It isn’t right for DC citizens to be disenfranchised (seriously). Carve out a small - and I mean small - federal district out of DC. Office buildings and parks. Nothing more. The rest goes to Maryland.
As for PR, run it through the normal statehood process. If it fails anywhere along the way, cut ‘em loose.
Puerto Rico is an independent country when it suits them. At the Olympics, in beauty pageants, and in the World Baseball Classic they compete as an independent country, not part of the USA They are Americans when they want a handout.