I am in the process of a similar setup.
@psherman gave me the wonderful configuration change which you may find helpful: What terminal commands should I execute to understand why WAN connection fails after disabling the firewall? - #6 by psherman
From what I can recall, the configuration suggestions in my thread differ from the wiki page.