A phone of equal class from AT&T would be the Atrix 4G. Pretty sure nobody wants to choose between an encrypted bootloader or being stuck on 2G. :/
Well the merger wouldn't complete for at least a year from now, so there's no telling what devices would be offered by then. But yes, AT&T does not have a good track record when it comes to openness; so, I'd prefer something like the G2x to anything AT&T would likely offer. True, I would need to take an AT&T phone eventually if I want to stay up to date, but I'd like to avoid that for as long as possible.
XDA Developers was founded by developers, for developers. It is now a valuable resource for people who want to make the most of their mobile devices, from customizing the look and feel to adding new functionality. Are you a developer?