Get Motorola Shadow/Xtreme/Whatever in Q3, if it's available in your country. Since you are not confident at all about S^3 why not switch to Android.... It's very satisfying to use even if in pre-production status.... and if rumored is correct will get Froyo, though the device I played with had 2.1 instead.

If you can wait longer, then definitely suggest you wait for Meego... even if Meego is not what you want, you will have more choices by then since iPhone4 and newer Android devices are out.