Theres the unused composition 'Sail Barge Assault (alternate)' which is upbeat on the double Sony ROJ soundtrack (also called 'The Return of the Jedi (Alternate)' on the Bonus disc of the Star Wars Trilogy Boxset) it is just over 5 minutes long so there should be something you could use of it.
Can't wait to see more of your edit,
J