SBS 2011 - TS Gateway / Remote Desktop Certificate Mismatch Failure

Please bear with me as I was recently supporting a SBS server already setup. What I do know is that company is using mail.contoso.com certificate from GoDaddy that is used for seemingly all of there certificates against the server. Remote.contoso.com was issued by server-CA for the Terminal Gateway. Everything works fine and resolves to proper mail or remote.contoso address. Problem is when I enter the RWA portal, of which I can do no problem with certificate mismatch which is pulling the mail.contoso.com certificate. When I try to launch remote connection to PC its giving me "Your computer can't connect to the remote computer because the Remote Desktop Gateway server address requested and the certificate subject name do not match. Contact system admin." If I go and change the certificate on the RD Gateway Manager to remote.contoso.com obviously this works fine. No mismatches and I can continue to go to Public/Downloads/Install Cert. Download and install on client and RDP works fine. Only problem is that the Exchange hosted on the same server with the mail.contoso.com will then give all the client Outlook users certificate errors as its pulling remote.contoso.com now instead of mail.contoso.com. SO..how can I get the TS Gateway to just use remote and the mail to use mail? Is there anything I could do with DNS but Im thinking it will still have a cert mismatch. This has been very frustrating to say the least and TIA for any assistance!