I shot another wedding yesterday and overall, things went very well. I had rented a Canon 5-D and the 15mm fisheye lens from BorrowLenses to have a better second body than my old 20, and it worked out really well. The wedding was a leisurely affair, with pictures of the prep starting at noon, and me leaving at 8:00pm. It was quite the day, including 1,625 pictures! Now the editing begins...
Things I learned:
I'd like to do future weddings with a pair of cameras with similar interfaces, since switching between the 5-D and the 40-D was a bit confusing at times.
Full-frame is the way to go. It really takes advantage of the heavy glass I've been carrying around for 2 years. The 24-70 is finally a semi-wide angle lens like it was intended to be!
Also, I'm gonna need more Compact Flash space...