I've seriously eying the Galaxy S 2 even though I don't really agree with how Sammy has to muck with everything but it is unlocked and will work with AT&T 3G. That and the hardware specs are awesome. Though with the rumors floating around about an NFC enabled Galaxy S 2 just around the corner I am forced to wait and see yet again.
Maybe I can make my Nexus One last until the Nexus M or Nexus 3 or whatever comes out.
Actually I don't think I'd care much about an upgrade if my stinkin Nexus One had more memory... I am constantly having to uninstall programs I actually use just to get space for things I use more. /sigh