A clutch repair usually includes a clutch disc, a pressure plate assy., a throwout bearing, and a pilot bearing/bushing. You want a new clutch disc and throwout for sure, the clutch because it's pretty cheap and it's the wear part. A normal clutch life is around 40k, as you observed with yours, and the new one is 25% gone. The pressure plate is probably fine, as is the flywheel friction surface.

I would go back to the dealer for this one and see what they will do. Offer to pay for the new clutch disc, they cover the throwout bearing and labor.

and do Kevin's tests to make sure it's not tranny bearings...