ORBI vs Nighthawk

I finally resolved most of my Orbi communication issues (I believe anyway) and configured in Router mode where my cable modem is in bridge mode.  Took many many months to get to even this point.
I even had my cable modem replaced with a different brand which seemed to help dramatically, but now with the new Nighthawk models coming out I'm wondering which solution is best for heavy traffic homes with security cameras both wired and wireless and at-home offices.  Has anyone done any side by side comparisons as I really miss my older model Nighthawk router that got taken out by lightening where not protected (of course now all of my devices are protected).  The Orbi doesn't seem t have some of the more advanced features I'm accustomed to with the Nighthawk but I don't want to switch without knowing whether the newer model Nighthawk models are going to be able to provide enough bandwidth and speed to keep my 20+ devices operating as expected