I'd say that you "might" have too many hives... I'd try to kotow (a nice word for kissing butt) this neighbor, as fall and winter are coming fast, and the bee populations will decline as well as foraging. Than, I'd try to have an attractive (for the bees) water station of some sort ready for the spring. I'd recomend a distinct aroma/smell for your water, such as the lemmongrass mentioned. Hopefully, in the spring the bees will use your fresh water supply.