I had the same concern. I now use Gmail as my mail client but my email addresses live at Fastmail. So when Googles does something crazy to Gmail it will just be a matter of switching to another frontend.