Great thread even though AronM probably isn't getting the input he was hoping for.
My video equipment is ten years old and I need to upgrade as well. I guess that will mean a change in storage and work flow so it was nice to read the comments so far.
I'll probably stick with a separate DSLR and video camera however I'm blown away by what I've seen so far with a DSLR.
Here's a link to a local surf photographer's work that he shot with a 7D and the Canon 70-200 2.8
http://flshredcast.com/
I would be super satisfied with anything that could match that quality of his video.