Welcome, Sassy!
The "Complete Epic" has GF and II in chronological order, with about half of the deleted scenes included where they belong chronologically. But if you want the most complete version, you'll have to wait until the complete epic is shown on cable TV, probably on Bravo. The TV version has all the deleted scenes in chronological order--it's the best version.