Well I get nearly 1.7K on my Galaxy S but Quadrant doesn't mean dick really. Personally I'd get the Galaxy S II - Darky's ROM is apparently going to be coming to the SII which means that phone is going to be worth having.
However, if you're happy with what you're on now then I'd stick with it. However, if you're due for an upgrade or it's applicable to get a new handset, you won't be disappointed with the Galaxy S II.
The Galaxy S II is disappointing to say the least...it's cpu isn't as powerful as the Tegra 2, it has a larger 4.3" 800x480 screen, albeit lower resolution than the 4" 960x540 qHD screens (less PPI), and it feels cheap and flimsy. The only saving grace it has is the fact it ships with 2.3 which is optimized for dual core.
I'll take my Atrix any day of the week over the Galaxy S II (along with many developers on xda who have used both phones). The Super AMOLED+ is over saturated and can not compare in brightness.
My girlfriend currently has a Captivate running Cognition and it's an ok phone, but she fell in love with my Atrix the second I got it. She loved the Captivate's AMOLED until she saw the Atrix. The point I'm trying to make is - Samsung's phones are great on paper, but not so great in execution. They still have poor build quality, GPS issues, and the stock software is rubbish.
Now, I never run stock software on any of my phones so that doesn't apply to me. However, the SGSII does have the advantage in that it has an unlocked bootloader, whereas the Atrix has a locked bootloader (although there are PROM's available which are great) and there's a lot of determination from the developer community to crack the bootloader.
By the way, this isn't a post to try to sell the Atrix, I'm just comparing the two highest end phones out in the market right now. When it comes down to it, the Tegra 2 is a better and more supported platform especially when running 2.3. The SGII's screen is a bit disappointing at 4.3" 800x480 vs 4" qHD (such as the Atrix) at 960x540.
Before I start getting bashed as a fanboy I feel I should point out that I had a Nexus One for over a year (loved the phone and screen then I compared it to the Atrix and was blown away). I've had an Evo, Droid, Hero, Galaxy S, and have played with 75% of all Android phones out there (I'm a huge phone nerd).
Anyway, take my opinion with a grain of salt. I'm just trying to give you one person's point of view so you can make a more educated decision. Either way, you won't be disappointed with any phone you get. The SGSII is a great phone but I feel there are better offerings right now as well as in the works. I'm personally waiting for the Nexus 3 near Christmas which is supposed to have a Tegra 3 quadcore (5x faster than Tegra 2), Android OS 4.0 Ice Cream Sandwich, and a 4-4.5" 1280x720 screen (depending if they use the Toshiba 4" or Hitachi 4.5", both of which designed for mobile phones). The phone is supposedly going to be made by either LG, Motorola, or Sony Ericsson.
It's going to be an exciting year for phones!
-Matt
£10/month 
It's too bad I like Vanilla over Sense but nice nonetheless. Enjoy! 
