All this new ending talk sounds awfully complex in terms of making new stuff. I don't see the big problem with the wedding as an ending.
Sure, the concept of Anakin and Padme not getting married is interesting. But it leads to a sticky spot, especially in the next movie when she's suddenly pregnant. This movie is supposed to appeal to kids on some level, after all.