Part of what was Dc was given back to Virginia back in the early 1800s. It is now Arlington and part of Alexandria. The rest, north of the Potomac River was part of Maryland - it could go back to Maryland rather than being considered a separate entity.
Yes that is the way it should work. I view DC as any other city in the USA. No other city has their own voting rights so DC should not either.