TZ7 vs TZ20 - big update?

I have a TZ7 at moment and use it as my still and video camera. I'm a total point and click, and just use iA all the time and results are fine for me for my fa,ily pictures.

So is the newer TZ20 a big update? I know it has full HD video over 720 lite on TZ7, and GPS but I've heard that the pic quality isn't good on TZ20?

I use a Mac and iPhoto so the pics already embedded with GPS would be good, but not essential I suppose, also I expect this hammers battery life. My TZ7 hasn't got that good battery life, I have 2 batteries but as I say I use it as a video camcorder as well so a lot of zooming in and out.

Any ideas? Should I upgrade and sell TZ7? Or is there a better all in one now, as I prefer having a digi camera that can do both still and video well in one camera

Cheers