Hacking together older footage and the new HD or DVD source was one thing that never convinced me about the "Classic Editions."
I think your approach of using the same source for as long as possible prevents it from looking as jarring. Especially when you could have salvaged part of one shot; just don't bother and let it be what it is. It looks better that way.