Not sure about your budget, but I switched to a udm se and it's pretty awesome, for me the benefit comes in with cameras and access control. the UI and off the shelf tooling is very nice with it.
Opensense is another more diy option.
I used an edge router 4 before the udm for a few years and it was pretty ok.