It may be appropriate for the person who moves the holes, (hopefully each day) that they also spend a few minutes checking divots and repairing them.
Also, expand the Ambassador's responsibility to check and repair divots. That is probably the best fix to the problem and it is not unusual to have this responsibility given to the Rangers or in this case Ambassadors.