I am in exactly the same boat, same upgrade date as you.  I'm hoping I can get an upgrade next week, but I dunno if att will allow me to.  I got the one x last year and I was burned badly.  I tried to different HOx's and both had issues.   I got a GS3 after taking my HOX back and it just worked and was everything the HOX was not.  I liked the new HTC One in the store and i like the idea of Zoe, but I keep seeing post about Gap issues and camera quality issues, errors that require reboots or issues with unresponsive buttons and I am scarred to get it because of all the issues i had with the One X.  Meanwhile, the SG4 is going to be a great phone, but I feel underwhelmed by it looking like a bigger SG3.  But I do like the 13MP camera, bigger screen  and i like it being on 4.2.2 among other things.  I figure i will at least wait until the SG4 is in store so i can look at one and compare them, but i just don't know either.  Good luck to you in your choice, i would be interested to see what you choose.     
