Thanks for all of your advice earlier.
I ended up having a lot of issues with the i7500 (rebooting, dropping calls, shoddy reception, etc), not to mention how I was treated when I called into customer service for a hand with things, so after a lot of complaining and taking it right up to the top, they gave me another hardware upgrade.
So, in the end, I picked up a Desire Z the other day ($79.99 with a 3 year contract for the christmas special, I basically ended up tacking 2 months onto my existing 3 year). They told me they'd recycle the i7500 if I wanted them to, but I opted to keep it, and its now going to go into my work bag/tool bag so I can have something that can get bumped and battered during work for the rare times I need to need a phone. The DZ would get wrecked.