US president says deal ‘95% complete’ but two leaders acknowledge there are still ‘thorny issues’ remaining