Casey, check out the Nikon D90 here:
http://www.nikonusa.com/Find-Your-Ni...25446/D90.html
It gets great reviews - I have a friend who has one and he loves it, it's a great camera - also does the 24fps video, which is the frame rate in cinema. They have examples of the D-movies on the site and it's pretty impressive. The only drawback in the D-movies is the sound from what I've heard, but if you get serious about using that function you might be able to go with an external mic.
Canon is good too but I'd have to give Nikon the nod - of course like I said I've got a lot of the older Nikkor lenses and the D90 is still compatible with all of them, so for me it's a no-brainer. Nikon optics are tough to beat -
Still leaning toward the Olympus for the waterproof point and shoot though - just trying to find something around the $300 mark + or - ....or otherwise I may just bite the bullet and go with the D90