Finally made the switch to @Tutanota Mail. Not 100% done, have a lot of accounts under [them who shall not be named] Mail, but I believe this is a good first step.