I recommend FastMail if you're willing to pay for your email services. They have an excellent import tool to help with migrating your email from Gmail.
Went it comes to governments spying on people, I weigh Fastmail the same as Gmail. Considering I find everything else about Fastmail better than Gmail, I am slowly making the switch (using my own domain names though so I could potentially switch again in the future).
