The second is a result of the United States being based on the principle of jus soli, as opposed to the more common jus sanguinis.

It's not some incidental issue. Resolving it would mean completely overhauling what American identity is.