HTC One X is a very capable phone. Hold off for another year. Next year, get a Nexus, which will probably come with ART VM, which would be a lot faster than current Dalvik VM. Also, there is a possibility of introduction of 64 bit instruction set in the processors. Also, Google is building a better camera stack, which should be ready by next year... -- Google is working on a new Android camera API, supports Camera RAW | Ars Technica
Load up some custom ROM on HTC One X and it will be good enough for a year... I would do that if I was in your place. My current daily driver is Galaxy Nexus, which is already 2 years old specwise, but fast enough for me... Will push it till next year as well... HTC One X is a lot better than my GNex, with a better screen and camera. Hold it for a year, might be worth it...