Have you thought about an entry level rebel? On full auto(green) Its a nice point and shoot with probably more versatility than either one mentioned. On Manual, you can have infinitely more control if and when you want it.
Even the low end rebels are great cameras. The trick isn't how nice the body is, it's how nice the lens is. I spend way more for good glass than I do for bigger chips. Now a days, the chips are all too big for practical applications, ESP web. Whatever you buy, don't get hung up on megapixel size. Anything over 10-12 is more than you'll probably need.