Probably not. iPhone v1 wasn't subsidized. So when you moved from v1 to v2, there was no contract issue to worry about.
However, now there is a committment to worry about. It's possible that AT&T might offer a middle tier of pricing for v2 owners wanting to upgrade. But, I wouldn't hold my breath.