You guys with recent builds thinking you have this problem are likely experiencing something different.
I say this as someone with a 2021 Pro with ~70k miles, and can attest the original issue here was fixed from my experience.
Have you seen these hood ditch light mounts? You could easily aim the lights forward (many do..) instead of towards the ditch. I have this exact product and can vouch for it:
https://www.amazon.com/dp/B07Y2SJJZC
Actually, there's a better way to deal with the gear-hunting if you're back on "flat" land and it hasn't up-shifted - you just tap the gas pedal. That's it.
47k on my 2021 Trd Pro OEM rotors and pads and they perform so well I will replace them with the same OEM parts whenever that may be. I read I should get well over 100k out of these, and it's looking that way so far.
Just my experience if you feel like giving OEM a try. Good luck.