You might not want yet another option but if you are wanting to swap to non-custodial lightning then you might want to try AlbyHub. You can even book an onboarding session with them and they will walk you through the setup process and get you going. This option is not free though as you will either need to host the hub yourself or pay Alby 21,000sats per month to host the hub (10,500 for first three months).