Maybe a next step could be a router like https://eu.protectli.com/product/fw6e/ ?

Protectli is very nice, but the area could use a push forward.