Here's the version I would have created, had I been the album's producer. What I did was I made sure every track that was ever in the film was included as well as the all the alternate versions that were revealed on previous issues that related to Jedi.

Disc 1:

1. 20th Century Fox Fanfare
2. Main Title/Approaching the Death Star/Tatooine Randezvous
3. The Droids Are Captured
4. Bounty for a Wookiee
5. Han Solo Returns
6. Luke Confronts Jabba/Den of the Rancor/Sarlacc Sentence
7. The Pit of Carkoon/Sail Barge Assault
8. The Emperor Arrives/The Death of Yoda/Obi-Wan's Revelation
9. Alliance Assembly
10. Shuttle Tydirium Approaches Endor
11. Speeder Bike Chase /Land of the Ewoks
12. The Levitation /Threepio's Bedtime Story
13. Source Music: Jabba's Baroque Recital
14. Source Music: Lapti Nek
15. Source Music: Sail Barge Jam
16. Source Music: Jedi Rocks
17. Jabba the Hutt (concert arrangement)
18. Archival Bonus Track: Sail Barge Assault (Alternate)

Disc 2:

1. Parade of the Ewoks
2. Luke and Leia
3. Brother and Sister/Father and Son /The Fleet Enters Hyperspace/Heroic Ewok
4. Emperor's Throne Room
5. The Battle of Endor I (Into the Trap/Forest Ambush /Scout Walker Scramble/Prime Weapon Fires)
6. The Lightsaber/The Ewok Battle
7. The Battle of Endor II (Leia is Wounded-The Duel Begins/Overtaking the Bunker/ The Dark Side Beckons/The Emperor's Death)
8. The Battle of Endor III (Superstructure Chase /Darth Vader's Death/The Main Reactor)
9. Leia's News/Light of the Force
10. Victory Celebration/End Title
11. Source Music: Ewok Feast/Part of the Tribe
12. Source Music: Ewok Celebration
13. Archival Bonus Track: The Forest Battle (Concert Suite)
14. Archival Bonus Track: Leia's News (alternate)