Yeah, it sure does contain elements from previous and future scripts. Also, the section where Luke recruits the alien natives by defeating one in a fight is taken from the 1974 rough draft, and the plot-propeller of the Kaiburr crustal is from the early drafts as well. Aside from that, Lucas basically just used the plot base of Raiders of the Lost Ark for the story, as you mentioned.