For zaps, Wallet of Satoshi is really great. You can then move your sats to a self-custodial wallet like Phoenix once they reach a certain amount
Discussion
But as others point out, you don’t need to change anything if your current setup works for you