Have you looked at Unify stuff? When we moved I bought an edgerouter and extended range access point. It covers both floors well and all the way to back of the pool, and it's still not mounted yet. Just laying on top of a bookshelf, inverted.
Not as user friendly for non-techs but I think you would love the features and abilities.
I think it was about 170 for both, maybe 225...well worth it and has been better than the consumer stuff I've always had.