[...]
Should we leave exchange completely and switch to a non custodial wallet?
It depends on you, the user. If leaving an exchange doesn't cause you any problems or make it difficult to do something related to your Bitcoin, then just leave it because there's no point in continuing to use an exchange. But if you frequently need to exchange your Bitcoin easily, then you still need it.
This is probably just me, just my feeling. But somehow, reading some comments here makes it feel like using an exchange wallet is somehow the wrong thing to do, when I myself am one of those people who still use an exchange wallet to store some of my BTC. It's just more convenient for me to receive BTC directly into my exchange wallet so I can trade it instantly. I use my exchange wallet address to receive my salary (USDC) and payments for the services I provide (BTC and stablecoins).
I am not saying I am against the "not your keys, not your coins" principle. I'm also not all in on using an exchange wallet. I still use a decentralized wallet to keep the BTC that I don't plan to touch in the short term.
I have experience with hacks. Two exchanges where I stored my coins were hacked at different times, but both exchanges are still operating today. They couldn't recover the coins that were stolen by the hackers, but they took responsibility for making the situation right. Their reserves were enough to cover the losses, and they continue to operate normally as if those hacks never happened. In this case, I was probably lucky to have chosen the right exchanges.
I also have experience losing the private key to one of my wallets. It didn't contain many coins, but it was enough to keep me thinking about it.
What I am trying to say is that whether you choose to keep your coins in a non custodial wallet or on a CEX, both always come with trade offs. It's also not something to compare because their main purposes are different, and there's no rule saying you must choose one over the other. Use both, one as a cold wallet and one as a hot wallet, just like many other people do.