How about adding a rule instead.

Failure to replace divot - 1 penalty stroke
Failure to repair pitch mark - 2 penalty strokes

I've made the pitch mark 2 because its my rule change so I can and its the thing that annoys me most - especially from "mature" golfers with all the gear but no manners or sense of etiquette - we've all met them, normally in the painfully slow Sunday morning fourball ahead of us.

Rant over.