Curious to know people's opinions between the two routers.

I live in an apartment and have approximately 31 devices (various stuff including smart home gear).  I don't need mesh capabilities and currently on the 900/500 plan.

I've read about the orbi and 25 device limit but not sure if that is just an optimal number for active clients or if there is a hard limit. 

Thoughts?