Upgrade to HTC One or wait?

I've got a One X and I'm due an upgrade. I've got the usual yearnings about shiny new gadgets but don't know if should wait (possibly for the next Nexus) or jump straight for the One.

The HTC One is obviously fantastic, but I'm not too sure if its a big enough upgrade from the One X. I'm running Cyanogenmod 10.1 which I'm not too sure I want to leave behind- apart from the poor battery life. The speed of updated and stock on The Nexus is obviously a big plus, but the hardware has always been slightly lacking on comparison to the competition. I think is thence annoyed if I waited for the Nexus 5 and was disapointed

Any other One X owners thinking of upgrading?