I'm aware of the Ledger leak and I will either get a Trezor or if I decide to get a Ledger I will take the precautions you mentioned.
Whichever hardware wallet you decide to get, make sure to check its downsides and potential vulnerabilities (e.g. Trezor seeds can be extracted within a minute or two if no BIP39 passphrase is used).
No hardware wallet is perfect. Each has its up- and downsides.
It's important to compare them and decide for yourself which matters the most in your specific case.
I will keep that in mind. Thank you.