I could look into that, but I don't really mind waiting. According to this
contract upgrade checker, my "upgrade date" is 6/25/11, which I assume means I can upgrade via Best Buy, if I want. For example, they have the Nexus S for $100 right now. It runs stock 2.3 Gingerbread but is only 3G.