Yes, I'd second the Edgerouter recommendation. Just note that anything beyond basic configuration doesn't come with a friendly GUI. But I do like having my router configuration checked in to git 🙂