When Luke is in the cave on Dagobah, do cutaways to the idol temple from Raiders to make it appear he’s walking around in there. Maybe even use the music from Raiders?
Also, Vader’s mask explodes to reveal Jar Jar’s face.
If the cave is gonna be from Indy, I’d rather it be Beloch in the mask, with his insane laughter mixed into the soundtrack.