Diplomats trying to salvage a landmark nuclear deal with Tehran wrangled around the clock over sticking points to an agreement that could bring Iranian oil back to the global market at a critical time for the world economy.