HTC Inspire if you need it now, No lock of getting decent firmwares with the Atrix. Look at the XDA Forums, a developer just posted the poor outlook for the Atrix.
http://forum.xda-developers.com/show....php?t=1050624
You can also wait for either the Samsung Infuse 4G or Samsung Galaxy S II come summer. The LG Thrill 4G is also launching soon.