Swap resonator for crystal?

The internal oscillator is even less accurate than a resonator!

If power consumption is not a big issue, you can get some very small crystal oscillator modules. Since the oscillator circuitry is internal, they wouldn't be as sensitive to "rework" style wiring.