HTC One or Moto X ??? [UPDATED]

I have an upgrade (Sprint) and i need some advice as to if i should wait for the moto x even though the leaks seem pretty disappointing, or go with a black htc one and put the GE Rom because i am a lover of stock android. I am leaning towards the One because of the 1080p screen and im coming from a note 2 and i think that the moto x's 4.7 inch screen with about .3 taken up by software keys would be too small. Thanks in advance for any advice/help!

[Update] Well now that the moto x is real. What do you guys think?