Getting email to work with a CNAME

I just moved a static site to Github Pages, which required me to make some changes.

The setup I used to have in my control panel was:

• The domain www.my-domain.com was a Cname pointing to my-domain.com.
• The domain my-domain.com was serving the website I had in webfaction.
• Email to chris@my-domain.com was working fine.

Now, I have changed to using www.my-domain.com as my main site, and my setup looks like this:

• The domain www.my-domain.com is a Cname pointing to myusername.github.io.
• The domain my-domain.com is serving nothing, and is set to webfaction for hosting and email.
• I don't know if email is still working yet, but I assume it is.

I thought I could just change the bare domain to a Cname pointing to the www version, but it looks like that will mess up email. Is there a way I can still get email to work while having the bare subdomain point to the www version, which is a Cname to GitHub?

Thanks!

Edit:

I implemented the redirect application as described in the link, and http traffic is working, but now emails are not reaching my inbox. Is there a way to debug this? I didn't make any changes to the domain other than changing the application.

Edit to edit It looks like emails are actually being delayed by a few hours, or dropped. I'm going to open a support ticket instead. Thanks!