I went with the Olympus. It's a generation newer than the Nikon, comes with twice the lenses, and with the 10% off sale at BestBuy, it was pretty close to the same price as the Nikon.
It's supposed to ge delivered today, so watch for some test photos soon!
Nice weather this weekend, but just couldn't find the time to fly. I did get away long enough to take the dog for a walk and get a few practice shots with the new camera, though: