Can I use FWP Router Mode with UniFi USG

So I upgraded from FWB+ to FWP and I love it.

However, I'm having trouble after switching to Router Mode on FWP (I blame Firewalla after sending the newsletter yesterday explaining the differences with Bridge Mode 😉). I want to use FWP as a Router and DHCP Server and would also like to use VLAN tagging. I'm using the USG for IDS/IPS but now that it's behind my FWP my controller can't connect to it. I'm a software guy not a network engineer so this is out of my expertise, any suggestions?

Before
Netgear CM1100<-->USG<-->  FWP  <-->USW Flex Mini<-->Pi-Hole(1&2 DHCP)
                                               (Bridge)                               <-->Orbi RBR50 (AP)
                                                                                           <-->Nighthawk R7500 (AP) VLAN IoT
                                                          
After
Netgear CM1100<-->USG<-->     FWP      <-->USW Flex Mini<-->Pi-Hole(1&2)
                                              (Router/DHCP)                            <-->Orbi RBR50(AP)
                                                                                                  <-->Nighthawk R7500(AP)