My threat model is an un-educated population of people who don't value privacy or care about surveillance. I'll put up with shitty tools in the mean time but can only support those who are building a better future.

I would switch to Gmail and donate my $50/year to EFF.