Late for your purchase, but in case others read the thread......
My son gave me a Canon G11 (there's a G12 now). It's not small or light or cheap, but it's got the sensor used in Canon DSLR's and all kinds of manual or automatic modes. Without actually getting into a DSLR (and it is smaller than that) it gives you a lot of control and stuff to play with, if you want, or fully automatic functions.
Really sharp photos, turns on really quick, big display, and a very reasonably priced underwater case, which I'll try out this Christmas.