If there is a problem with DC security, and if it’s constitutional, simply have the state of Maryland annex DC. Problem solved.
Or just make Puerto Rico a borough of New York City.