I was thinking about AotC today and how it ends. I've concluded that the wedding scene should be removed. If their love is supposed to be "secret" and "forbidden", then why have an official wedding? With records, witnesses, etc. -- it's no good.
I don't want to lose the scene completely. I was thinking it could be added to Anakin's vision in RotS. Start with the wedding and have it morph into the nightmare. I think it would give it more of an emotional impact there, as well as making it more surreal.