For people needing alternatives. I've had good luck with foritgate. Some of their APs are dogs, but the fortios in general has been decent.
What's wrong with the ap's? Have you used the switches? How much of their kit can managed via a single console?
The switches have been pretty solid. Everything can be managed off the fortigate, I think they also have a cloud management platform.