I'm down to these two phones as well. Starting a new job and they give me the choice of phone. Moving onto a company phone contract from a Nexus 4, which will become my happy wife's :)
From what I've found online, I'm leaning towards the Moto X. I like the smaller size, Motorola is now owned...