Thank you all for your helpful suggestions. We are keeping everything as is. He knows every inch of the property and I like that he has such a good reputation.
Maybe we will be known as those "crazy gringos" who had so many questions and had no idea what they were getting into... ;-)