Just out of curiosity, did the movie confuse anyone else?  The first time I watched it I thought they had somehow recaptured River.  The Second, that they retconned Jubal Early grabbing her (after all, "Heart of Gold" was the only episode after that and it never aired.  It would be an easy change to make).  It was at least the 3rd or 4th time that I realized that that was a badly retconned flashback of the original rescue.