Could you have two baptisms? I know it sounds silly and I agree with you, but if he's so passionate about it why couldn't you have one at each church. It's the same God, just different words. Your child will eventually decide it's own religion and sometimes they are rebaptised anyway.