I'll still choose hardware wallets for safekeeping my Bitcoins. The wrong choice of people buying from the wrong manufacturers or suppliers is due probably some prices are cheaper than the original one. While these hardware wallets are safer than usual way of keeping Bitcoins because we have to verify it alone per transaction unless your seeds have been stolen and there is no need that. And of course, except those rigged hardware wallets. IMO, hardware wallets are still my go-to if it's about keeping my bitcoins. But, it's also good to have those non-custodial wallets if that's your preference as long as you know how to keep your wallet safe and away from potential threats.