Camera Labs

I currently have a Panasonic Lumix FZ40, but am finding that we are not using it as much as we would like due to the size. I would like to find a Point & Shoot that is relatively compact, still had decent zoom capabilities, and it otherwise an overall upgrade to the Lumix FZ40. The camera would be used for family outings/vacations, quick pictures of our adventurous toddler, and would like to use it for video as well.
My budget is ~$300, but willing to spend a little more if needed. Currently, I was looking at the Panasonic Lumix ZS20 and the Canon Powershot SX260. I believe on paper they looked to be what I want, but I don't know if either of them would be an overall upgrade to what I have. I hope the community can help me out here.

Thanks,
JD