US, Mexico tentatively set to replace NAFTA with new deal