If you’re doing Yub Nub in Episode VI, you should use Sebastian Shaw. Hayden would completely feel out of place using the original ending.
Also, you can ask HAL for the audio for “A Jedi Master who instructed me” in Empire, and “I wanted you to have this” in SW77.