I’m still learning but I think #[4]​ wallet would fit. It’s non-custodial as long as you connect it to your own node. For zaps you’d need a little extra on the lightning node though (someone needs to send the zap note)