I'd for the iPhone 4, the X10 is a nice device, but 1.6 is quite old now. And the currently planned upgrade is only for 2.1 if I recall, and by the time that comes out, 2.2 will have been released for even longer then it currently has.
If Android is something that you want to try, I'd suggest...