Consider switching to Fastmail rather than going back to Gmail! I switched from Gmail to Fastmail five or six years ago and have not missed anything.

Plus if you take advantage of this switch to get email at your own domain, switching providers in the future will be much easier.