My speedometer and odometer stopped working yesterday ('05 9-2x Aero manual, 40k miles). Reading some forums, it sounds like it's the speedometer gear inside the transmission. I still have 10k miles left on warranty. Here's the question...

I'm reading that a lot of people are burning through their clutches pretty quickly. Some people have recommended replacing the clutch while the dealership is in there repairing the transmission (free labor). Any advice on this? What was your experience? Also, I'm considering (maybe) some upgrades... anything come to mind that I should have them do while the transmission is out (upgrade clutch, gears, etc)? As of today, the car is 100% stock. Thanks!