I believe that the simplest solution to the OM-15 and OX-38 (et al) mix-up is to burn all the bloody OM-15 in the universe.
It's horrible stuff and clucking dangerous.
Bring in some nice self-contained Electro-Actuators instead; we may save a few lives in the process.