I'm a big fan of just getting it to work on the happy path. In this case, the rest of it sounds like doing extra work for no reason.

If you don't use the "happy path" builds, the choice is yours, and the consequences are your own. Simple as.

That tinkering attitude is the root of the problem in the Arduino ecosystem.

Just do things properly - it only has to be done by the vendor anyway, and no one else needs to touch it.