Metalloy wroteactually are good with there updates, and more importantly they are really helping the guys from XDA so you'll have plenty of years of rom flahshing if waiting for the official update isnt cutting it for you.
If you really want to wait, the obvious would be galaxy s3, BB Z10 which would be really expensive at this point, or possibly HTC one X if you feel like sticking with HTC, I wouldnt go for an HTC these days after seeing 3 out of 5 people having connectivity issues with their HTCs, mainly wifi issues.
Exactly why I'm staying away from hTC (my bro own one and I was really disappointed although Sense UI is awesome)
Seeing that the Galaxy S2 has still updates roling (jelly bean announced for february) I think the best pick would be GS3. Also I'm not a flasher type since I am "scared" that it might ruin my phone :/
I considered Z10 but 600$ is too much :/