taking photos of my baby as she grows - image quality and ease of use

Hi there, I am a beginning photographer and currently have a Sony Cybershot DSC-H3.  I want to upgrade to something with better image quality that will allow me to grow as a photographer, but I don't want a big cumbersome DSLR.  I mainly photograph my 9 month old daughter.  I want something that has superb image quality and is good at macro shooting.  I don't care so much about zoom.  I don't want too steep a learning curve so that I can't take it out of the box and start using it quickly.  A friend has a Lumix GF1 and takes wonderful photos.  Do you think the GX1 or NEX7 is more suited to me?

Thanks!