If that had been me, I would have run "No State Religion". Sure, you will lose the happiness bonus, but diplomacy between you and the others would have improved immensely, which I would deem more important - and eventually, if you had allowed open borders, the others would have spread...