Correcting bad JSS records?

Valued Contributor III

We have a fair number of systems with records that are a bit off: data is stored in the wrong fields (usually extension attribute data). This causes problems with reporting and smart groups.

The only way I see to fix this is to delete the system's record and re-enroll it. The problem with that is I would lose FV recovery keys for encrypted systems.

Is there another way to fix these records? Is this a common problem? We're running 8.64 still since we can't upgrade until January.