I am in your same boat. I have been running CM 10.1.2 and it has been nice but there is definitely lag that drives me crazy sometimes. The Moto X looks very promising but it will come down to price and battery life.
The rumors of the $199 price point is very enticing, I can only hope it hits around that. The battery has had many rumors around it everything from 1500mAh to 2200mAh. I want the maximum battery life from my next smartphone, if it's at 2200mAh I think it will be sufficient. The other rumor that holds promise is of the removable cover and the possibility of a removable battery. This would be cool.
I just bought 2 new Anker 2200mAh batteries for the old Galaxy Nexus and it has breathed new life into the device's lasting power. I had been using the original 1850mAh battery since day one and it was showing it's age.
If the Moto X doesn't deliver then I will wait for the Nexus 5 or even possible one of the upcomint Motorola releases.
We will know a lot more about the Moto X next month.