Help! My 3rd Generation 20 Gig IPod is Broken! Replace or Repair??

Okay, Pod-heads, I need your help! First,the battery started losing power, so I changed it myself. It worked great for a little bit, then suddenly, I got that file folder display w/the exclaimation point. Was told by the Genius Bar personnel in the Apple Store that it would be better to replace it, the newer ones have better battery life, more whips and jingles and they would give me 20% off a trade-in, yada, yada. So....

I've still not made a decision. Most of the Pod repair folk I've contacted are pretty well fly-by-night without official Apple Sanction. I've been living off my shuffle, hoping the price will drop (especially since the Nano has been released.) But it looks like I may have to wait until January if I want a sale.

Anyone know stuff I don't???? Thanx for any advice!