Putting files in the target sysroot that are in fact native binaries.
Don't do that.

> The major surgery would be less maintainable.

Can you not work with upstream to integrate the changes?
Alternatively, if the native parts are relatively simple, you can just
build them directly.