Check out the Nokia Lumia 1020, at 41mp its the best camera on the smartphone market, period. It is more expensive but it all depends on if you're really serious about it. You can also get a camera grip for it that has a tripod mount and IIRC has 6 extra hours of battery.
I went smartphone with good camera.my Nokia 820 has Carl Zeiss lenses .it works best for me because I'd rarely have the Camera with me at work.