My upgrade is on March 3rd and im hoping the Thunderbolt will be out by then. If not i will get the Droid X. If i have a choice between the 2 (and since 4G is not important to me as i will be running mainly off of wifi) the determining factor will be if the Thunderbolt has a swype keyboard preinstalled. Can somebody tell me if it does? Thanks.