Looks like I will be jumping ship shortly too, to a sammy s2.
The n1 is still fast enough for me but I have hardly any apps on it anymore. Installing google+ the other week meant I had to delete a boatload more to squeeze it on.
If it wasn't for the almost weekly app purge I am now doing, I would also wait until the rumoured n3..
Ironass- same here i'm not the only samsung snob then!
Just got to start the long conversation with retentions to get it for free now!