You may want to look at the Galaxy Note. May fit your needs for both a tablet and phone in one device. And it will have Ice Cream Sqndwich by May as well.
Then there is the Samsung Galaxy S3 phone coming out in a few weeks, with all the latest bells and whistles.
You can easily move to Android from iOS. I did it about a month ago. No problem.