I am with Verizon, I believe if I am within six months to the end of my contract they will let me do an early upgrade for a new phone. I know you said you may not continue with your current company, but this solution may help with that decision if they offer it.
I would like to share this about Verizon. I bought a Blackberry Pearl 8130 about 4-6 months ago. I truly have beat the living heck out of this thing. It is also evident by looking at it. It would no longer take a charge. Assuming it was the battery, I went to verizon expecting to pay, probably, $50-$100 bucks for a new battery. Without question she popped a new battery in for me and said I hope this works. How much?, no charge she said it is under warranty. Blew my mind, there always seems to be some small print that seems to screw me on warranty issues.
Well, it wasn't the battery it was the phone. Walked right back in from the car, told her, said a new phone would be at my door in two days. Oh, and keep the new battery, send your older one back in with the phone.