About the wedding:
Have you considered keeping a trimmed down version of it with no dialog and Marions Theme playing over it?
There is a clip of this floating around here somewhere and it works like a dream. Plus it maintains the Indy versus normal family life arc.
Just a suggestion.