If you've had it for over 2yrs (are the Mk2's that old yet? - probably just barely) then the eBay prices are still a bargain! Besides, you voided your warranty when you added the drives (the initial Mk2's didn't come in 60GB I don't think..) But none of that matters because service should be cheap... the real concern is HOW is happened. I'd hate for you to get your player back from Cambridge and pop it in your truck just to have it happen again...
Sounds like you'll be fine - you're in good hands now!