Good question. I've got the same problem with mine. I suspect that I'll end up paying to have mine fixed, because I like the older setup better. I don't have to worry about carrying around a dock to charge it, and it runs happily off of a standard and easily available firewire drive.

FWIW, I've got instructions on how to open her up and what sort of drive to swap in, if that has any bearing on your decision.