Motorola Photon or Galaxy S II

My contract with Sprint will be up in a few months, time to upgrade my phone. I'm trying to decide between the Motorola Photon or the Galaxy SII. The Photon is a beast, I love the nVidia tegra processors too. The galaxy SII is comming to sprint in sept., so which one should I get. The galaxy SII will have great specs too I'm sure, and a beautiful amoled screen, but I've heard the first galaxy S phones had some problems / glitches. What do you all think?

In a few months?
I think there will be new (better?) phones in a few months ;)

-----
Port of Call <--!--> Youtube

Yeah my contract runs out in november. But my old sprint phone is not working. So I tried to call Sprint's customer service and see if they could help me get a new phone now and they hung up on me. So I went and got a Droid Bionic from verizon today and will just cancel sprint in nov.