TL;DR
Essentially: two versions of charge stone. One version has the behavior that allows for chambering and/or battery and one has the fixed, originally intended behavior so that unwanted charge expenditures on non-held structures are gone. They each have slightly different appearance and visuals. Only one can be equipped at a time.
LONG VERSION:
Having played with Charge Stone a significant amount with a style that does not primarily utilize Charge Chambering or Charge Battery as my core thing, there have been instances where I modify another object accidentally, consuming my charge due to the current bug(s)/emergent behavior(s) that allow for, when used intentionally, styles like Charge Chambering to exist. In instances where someone using the Charge Stone hits another structure, whether intentionally or otherwise, and might prefer to retain their charge instead of suddenly having it gone, having the bug behind this occurrence fixed might actually be nice. I think it might be nice to be able to modify over structures with straight, kick, and stomp while holding a charged object without spending that charge. On the other hand, if this were to be implemented to the current, singular version of Charge Stone, those Rumblers who practice sibling fighting style(s) to my own would cease to have the core emergent mechanic that allows their style(s) to exist.
My suggestion: add a second "cracked" Charge Stone.
Details:
  1. It could have the current or similar behavior to what Charge Stone has now, allowing for things like Charge Chamber to exist.
  2. It would, presumably, be mutually exclusive with wearing standard Charge Stone given the extreme similarity in functionality. They could be thought of as essentially the same stone, just one is "cracked" and one is not.
  3. The particle visuals of the Cracked Charge Stone could, as others have suggested about Charge Stone, indicate that the boost is coming from the player and affecting whatever structure they might modify instead of just the structure currently held.
  4. To differentiate it from the standard version, the Cracked Charge Stone itself could look like a Charge Stone that has cracked in some way. Perhaps further visual indicators could be added to this. A rough mock-up of this alongside an image of the original Charge Stone is attached.
  5. The Cracked Charge Stone could have a description indicating that it allows you to modify other structures, while the standard version could specify that it only affects the object you're holding.
  6. The Cracked Charge Stone could be added to the market as the way to obtain this alternate version of the stone.
In addition to these things, the standard Charge Stone could retain its current visual, as once it is fixed, that visual should now be accurate.
Also, on a note about flavor, I think having this second version of the Charge Stone being a cracked version or similar could be a neat homage to the fact that the mechanics it has were not originally intended. It could also be a play on words, akin to when a phone or similar is "cracked" to do things it wasn't originally intended to do.
Thank you for your consideration. Peace!