Good job moving to a certificate. That's the best way. Two suggestions for you.
Make sure you have a private CA Certficate for an email address, called an “S/MIME Certificate” or an “email Certificate”. There are many types out there but you need one that can be associated with the email address you're using.