In the same boat. I currently just forward everything from gmail to ProtonMail and am gradually changing my contact email one at a time. It dawned on me that I receive mails from services I don’t give a damn about, so maybe I should not change those.