As others have said, definitely go to a custom domain!

I would suggest organising your email how you want it in your current account and use imap to migrate - makes it take easy. I'm not sure if that was part of your question but I didn't see it mentioned in the other comments.