As I understood the Bruce/Ancient One conversation, the idea that they could return to the exact point the stone was stolen, return it, and use the Time Stone to smooth things over, thereby not splitting the timeline.
The events in New York do present a problem for that, but for at least four of the stones, this should work fine.