I wouldn't have had the original NCC-1701 Enterprise go through a refit for TMP. The Enterprise in TMP would have been the NCC-1701-A, given how radical the design of the ship was. Meanwhile, I would have had the original Enterprise be a part of a fleet yard museum (being famous for surviving its historic 5-Year Mission). That way, when TSFS comes around, it would be the original Enterprise that would get stolen, for the trip to Genesis, before getting destroyed in the end (by being out-classed by the Klingon BoP). Then, by VOY, Kirk and crew get back the newly-repaired NCC-1701-A for more space stuff. Just a thought...