I think you have two of the best point-and-shoots already picked out. Staying with either Panasonic or Canon would be my advice.
I have a Panasonic FZ30 that I use when I don't want to lug the an SLR around, and I'm always impressed at how good it is for a point-and-shoot.
Click here to get to digitial photography review. An excellent camera review site.