Besides running a node, for non-custodial I can only really recommend Phoenix. Otherwise you might as well just stick with Wallet of Satoshi until the fees are low enough again to make sense sending any sats you want to save on-chain to cold storage.