Since you lost the calabration. Go ahead and add something before you program the chip. I have 2 chips that have "347c" for the factory calabration.

Someware I seen that you can add oscal = $80 in your code for a midpoint

Also are you verifying the fuses at programming time?