I’m in a near similar situation here. We’ve gone the UniFi route and we’ve been rolling upgrades to our AP’s, and upgrading our neighbor’s access in the process as well. This week we added the final AP we needed in our house, and now have excellent coverage throughout the property, soon we’ll add at least one mesh AP…