Go for galaxy W...really good phone under 1k
Ya SGS2 G version is use different cpu and gpu..i suggest u try to find non G version..but its really hard to get and if u could find it maybe got ap set..u also can consider HTC Sensation or u need top up abit n then go for Motorola Razr or upcoming Galaxy Tab Plus

If so, most phones should do well. You can get the XE and sell of the Beats and get a decent pair of earphones(Shure SE215/etc etc).

---

Added on November 26, 2011, 10:54 am
Either one would work. Just get the one that feels the best on hand to you.
Recommend you go for Galaxy W though.
There are still a few people in GS who sells the non-g version.
If you're so concerned about the version, you should go for higher end phones. Rumours can't be trusted and I can't confirm it for you. But I can confirm that the higher end Galaxy series phones will get ICS. And I think it included the original SGS too. Either way it'll make way to custom roms one way or another.