An Improved Statistical Point-source Foreground Model for the Epoch of Reionization