You won't be disappointed with either. Both take outstanding pictures and have more features then you'll probally ever use. Go an try them out for yourself... It's really going to come down to which interface you like best.
Don't rule out the higher end point-n-shoot cameras like the Canon G12. It's smaller so you're more likely to carry around with you, yet it still takes great shots. I find that I take alot more wide angle shots so my point-n-shoot usually serves my needs. There are times when you'll want/need a longer lense though.