Should I stick with the diamond or go for the black berry curve

[Northpoint]

I had the htc touch for nearly a month. I purchased the htc touch diamond from sprint with a new two year contract and a return 100 dollar rebate. I like the phone its sleek nice cool and it turn heads on the subway. The 3.2 megapixel camera is nice the opera web browser and youtube functionality is coolo, hwever Im getting tired of trying to customize the phone trying to tweak the phone. Htc touch diamond has a very poor battery life which i noticed compared to my previous palm centro, and has a major heat issue. Im wondering if i should take back my htc touch diamond to spring and replace it with the black berry curve before my 30 day return expires. Guys what should I do?