I switched to Tutanota for email and calendar and it has been surprisingly flawless.
To make the transition easier I started by forwarding all Gmail emails to Tutanota and I've been slowly updating my accounts to the new email. The plan is to eventually delete my Google accounts completely.