I'm quite Suprised you haven't switch Civics to Pacifism once your discovered Philosophy, You know SE + Philosophical + Pacifism = GP Spaming, no offense becuase it appears liek a newbie mistake LOL or were you waiting to get a couple temples up to assign a couple of Priest for Prophets before Switch to Pacifism???
It is no newbie mistake. The main reason he should not switch to Pacifism yet is that it requires the state religion to be effective. Unfortunately Berlin is the main city that Pacifism could benefit (including the GL) does not have Buddhism or any religion. We might get lucky and it will spread naturally to Berlin, or we might get the less useful Taoism for free.
Notice I suggested above that he change the build order in Madrid to be one or even both monastries. He could then spam missionaries of both religions to any cities that can make use of them