That doesn't work. If the timeline had already changed by that point, there wouldn't be a time machine. When they go back to "Hell Valley" 1985, they find out that Doc had been institutionalized and never got to test run the Delorean (And probably never finished it) Doc and Marty should have faded out too.