If under warranty or you have AppleCare, your drive will be replaced free (though after the disassembly and such you did that option may not be honored in this case).
I have had three client's Macbooks replaced under warranty because of similar problems and it was no hassle at all.