I think your first proposal was fine because it fixes a tricky area,
probably produces a binary much more similar to what was originally
intended, and I'm very skeptical the change affects any other binary
in the entire ecosystem (noone elses uses this flag combination).
Creating pre-ELF binaries requires hacks to the tools because the
upstreams don't consider it core development.