As much as I dislike UniFi, it is true that there isn’t really a competitor in their tier of equipment. Upgrading would be a good choice, but if you end up choosing to the with UniFi, I’d highly recommend the UCGs.