HTC oneX is the best android on the market right now by a long shot.
Samsung is supposed to announce their new Galaxy S3 tomorrow which may or may not be interesting. I’m still on a 3GS too and I’ll probably wait and see what the next iPhone looks like. If you don’t mind jumping to android, the one X is really stunning.