Galaxy two-point covariance matrix estimation for next generation surveys