Marilyn,
I've been thinking about you too. We just made our decision too. We decided to go with dotCMS. I don't know if the ink on the contract is dry yet. I'm chomping at the bit to get started but have a feeling it won't happen soon enough for me.
Don't know if you received any info on this year's Helix conference but thought you might be interested. Here is a link to their site.
http://www.more.net/conferences/helix/
We won't be going anywhere this year due to budget constraints.
I'd be interested in the approach you are using for you redesign as that is our next step.
Chris