Assuming that Epic 4g gets 2.2 in this lifetime (or within the next couple of weeks), I suggest the Epic. The keyboard is a great feature, and the phone is otherwise fantastic.
Use the Firefox Beta - it works to access https sites, including corporate email. This should get more press as I nearly tossed my device until I was told about it.