After hunting for a desktop and mobile Gmail replacement for a while, I have settled on Bluemail for both. Along the way I tried Mail.app, Thunderbird, and various open source thingies. None were close enough to the quality level of Gmail.

This new situation is probably good enough to keep me off gmail for good.