Yeah. I've arrived at just don't update and hope for a better option.
If a major bug arises or something that forces my hand I'm staying with core because censorship and the ability to roll back the chain is way worse than arbitrary data storage as I see it.
