Well, I think this proves that New Doc never got arrested.
Spoilers
http://www.youtube.com/watch?feature...1433E32#t=393s
As for New Doc comming to 1931 even if Edna changed the past, I think a timeline is never realy erased. I even think that different timelines share the same past in some points in time.
Here are some exemples. Before the ripple effect, the timeline still lead to an unchanged future, which mean that any future time traveler can still come in the past to a point prior to the ripple effect. If Doc came after the ripple effect, I think he would still arrive in an intact Hill Valley, but Marty would not be here anymore.
I think ripple effect can have different effects depending if you're a time traveler or not.
For a time traveler, the timeline changes around him.
For a non-time traveler, the time traveler disappears from the timeline, but is not erased from their memories.
Now if the time traveler itself is erased, he does not disappear from past people memories either.
That's why everyone in 1931 still remembers Old Doc and First Citizen Brown at the end of the game, and also why Old Doc is still on the photograph of FCB.
Now for timelines sharing same past, it's very simple. By logic it's obvious that the 1955 in BTTF1 before Marty's arrival is the past of both Twin Pines and Lone Pine timeline, an this apply to every time travel. And that explain why three different future Martys arrive at the same point: their three timelines share the same past, which means that the events that will create the timelines will occur in the future, since there is no ripple effect in 1986.
I hope I was clear enough.