I have been using Wos but would like to change to a non-custodial wallet

Phoenix. It’s not Lightning Address compatible but you can move sats there that you don’t want to hold on WoS.