Make the key (original domain ^ final CNAME).
Which probably would still have issues, but I think it's worth looking into.