I bought the almighty SGS2 and used it past 2 weeks. Then I sold it and am back to using my N900 for the same reasons as you pretty much. (and MicroB)

I do miss the 4.3" SAMOLED+ screen and watching HD videos on it though.