Some Guantanamo inmates would go to U.S. under new plan