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...