Thanks,
I've had a look at the X30, its too large for what my gf is after, but its a very nice camera, if I didnt already have a DSLR I'd be tempted.
The 3yr warranty on the xf1 was an extra cost from the retailer, but the camera was heavily discounted. I think I'll do a bit of reading up first...