Really really wish they'd made this decision back when the One X was released, rather than coming up with that crud about 'customers want thinness over battery life'.
Any chance that the battery might retrofit the One X - seems its the same form factor but is it any thicker?
The battery is the one thing causing problems with the original One X for me - it sucks harder than a big sucky thing, if you'll excuse the technicalities. The speed is more than enough, and the screen is the best out there by far (excepting the issues I had on my first 3!)
I'd love to see HTC offer a battery retrofit option (even at a cost) to their existing customers, but sadly I don't think companies care that much about their customers any more.
If/when I upgrade in 12 months this may be an obvious choice, but the whole bootloader / warranty issue is becoming a show stopper for me. Seems like HTC want the 'hackers' and 'fiddlers' to go elsewhere...