I would go definitely for the S2 in your list, second comes the htc. Hundreds of custom rome etc for the S2. But if you don't care about dual core and since you loved the N900 go with the N9 and o/c it @1.2
You'll definitely feel at home.