Me too. And HTC ain't doing much to keep me around, so...
I turn my sights towards this year's Nexus or next year's Moto X.
Like yourself and many others, I'm anxious to see what this years Nexus will bring but I have to admit that I'm very curious about the Moto X and would love to get some hands on time to test it out. While I find much of the features Samsung has recently introduced as gimmicky or just plain useless, I like Motorola's more minimalist approach and feel I'd get a ton of use out of the the handsfree elements of the Moto X (spend a good chunk of my day driving). I also like the more compact form factor without sacrificing display size. I have some reservations as well (camera, display, storage) so I'll wait until it's in store's before deciding if it's worth a go.