If July is your date then I'd wait a little.. Thunderbolt has been getting sub par reviews on battery unfortunately and Droid X2 is not much of an upgrade from a Droid X (if I remember correctly)..June/July is when Verizon will most likely release its heavy hitters UNLESS its gonna conflict with their iphone thing..
I would avoid Motorola if possible though because they are not very friendly when it comes to bootloaders for flashign custom roms (though there are rumors it will change in the near future)
Edit: new bionic information..no release date.. just specs:
http://www.ppcgeeks.com/?p=22077