Some here need to actually learn something about the history of PR. There is a small group of people pushing for PR. to return to Spain. They argue that after all, PR. was an oversea province of Spain with full representation in the Spanish legislature. This group has videos on YT. that explain that explains that PR. had it better under Spain. That when the US came in they undid the islands local economy for there own profit.
When it comes to solving DC status do what Mexico city did.
The Constituent Assembly of Mexico City (Asamblea Constituyente de la Ciudad de México) is a body formed to create a new constitution for Mexico City in the wake of the 2016 political reforms that convert Mexico City into a federative entity comparable to the 31 states; with "autonomy in all matters concerning its internal regime and its political and administrative organization."[1]
Read the spoiler for more info. taken from Wikipedia