The end of the UCLA vs Gonzaga game is a classic example of why the rules committee continues to look at possible changes to the end of game fouling. UCLA was fouling immediately for over a minute and it took almost 10 minutes to take a 1 minute off the clock.
If you just give the offensive team the option to shoot or take the ball out the fouling will continue. Perhaps one shot and the ball out of bounds as an option with the double bonus in effect and under two minutes. That would be a penalty for "intentional" fouls to stop the clock.