I just got off the phone after calling the AT&T rep back that was handling my BBB claim. The deal she offered me today was better than the original one on Friday so I took it. I traded my 830 for a 640XL (the only WP phone available from AT&T) and I'm not responsible for any more payments so I basically got the 640XL for $190 (the total amount of payments on my 830 to date). I'm not crazy about the size but I'll use the phone until the 950 comes out and then sell it. I figure I can sell it for $140+ and even if I come away with it costing me $50, considering I had the use of a phone for a year, I did OK.
I assure though, this will be the last carrier locked phone I buy.