if youre past your 30 days, it will be very difficult for you to talk them into a new phone. honestly, i was in the same boat with you between TP2 and the Hero. the deciding factor was getting a TP2 for free and the Hero is the first of many Android devices to come.
my friend who has a Hero calls it a good OS on a device that feels cheap. i believe Samsung is coming out with some high end Android devices. i would suggest you do a hard reset on your TP2 and wait it out a little bit.
i just hope my TP2 will last until Leo comes out