Supposedly an announcement will be made in less than 20 hours. In either case, it's widely speculated that Samsung will unveil their new phone in the beginning of May (I think the 3rd?) with more details, so I'd wait until getting specifications on that.
If you need a phone right away, I'd probably suggest the HTC One X. It has the best screen available, a good processor, and HTC will supposedly give it proper attention and support for the foreseeable future.