An improved mean-field homogenization model for the three-dimensional elastic properties of masonry