What did you decide?
I have an S2 (running Cyanogenmod) and my wife just got a Moto G. I lust after every aspect of her phone: the 2-day battery life, the sharp screen, the snappy responsiveness. The only way this might be a downgrade is the camera, which looks worse -- it doesn't focus well. (I don't mind the lower resolution but good autofocus is essential even for simple and quick snapshots.) However this could be a problem with the camera app rather than the hardware, and I'm going to try to wrestle the phone from her at some point, install a custom app, and find out. When I do I'll post again.
I'm thinking of getting myself a Moto G as well, so if you have upgraded I'd be interested to know how much you're enjoying it.