There's always the option of switching to Fastmail. If you're using Apple Mail instead of Gmail's web client, as I was, it was because Apple Mail caught up by growing an "archive" button and Gmail regressed. This made Gmail the more replaceable part, to me.