US, Mexico near deal that would set path for NAFTA revamp