New firewall / network setup suggestions. Is this hub spoke done right?

I'm looking at replacing an old ZyWALL with a pfSense box. Just wondering if I am doing this right or if there are any glaring errors I don't see. (I'm a one man band that doesn't have someone to ask.) Specifically, I'm wondering if that hub spoke looks ok or if I can daisy chain anything to make better use of firewall ports. Current and proposed and both at once