Plug a pc into port 2 on the switch with a static address in the same subnet as the wan and see if you can ping it.
Not sure about this but once you set the WAN back to dhcp, that probably enabled the firewall again.You can check by running pfctl -e, it'll probably say it's already enabled. Again, not sure if that enables it but any change in rules does so that may also.
You didn't say what type of internet, if you have a cable modem you will have to power cycle it anytime you change the directly connected device.
I wonder if your dhcp lease expired before you plugged the laptop back in and that's why it worked now. If you get a public IP there shouldn't be anything blocking that in the firewall.Obviously, if it isn't already, reenable pf and see what happens.