Yeah, you've got it.
And I still say the best source (assuming you want the 1977/1997/2004 starfield, and not the 1981-1995 starfield) would be Adywan's AVCHD edition. It doesn't have the timing changes that the Revisited crawl does, but it does fix the timing problems caused by the 2004 transfer. (Honestly, does anyone have any idea how the hell that happened?)