Pat,
You are still missing the whole point of that golf hole. The idea was to get lots of guys going for that green in two, not just the guy who can hit it straight into a 20 yard wide opening! The idea on that hole and on the 13th hole was to create temptation (not mitigate it)!
I remember taking with Geoff Shackelford one day about the 13th at Augusta National. For many years, the creek fronting the green was a combination of trickling water, pebbles, grass, and an occasional sand bar. This “irregularity” added to the temptations of a player who was not sure whether to risk going for the green in two shots. By offering danger and also the chance of recovery, the hazard in front of No. 13 created major headaches for the best players in the world. But then someone decided the hole would be better served if the creek were filled with several feet of water, thus eliminating the opportunity for those occasional recovery shots. This was supposed to make the short par-5 more difficult (like Pat is suggesting for #15, make it more penal for a bad shot). But raising the water level actually made the hole simpler for the best players in the world. Now that the creek offered no chance of recovery, a good player who was 235 yards away with a hanging lie had virtually no temptation to go for the green. The decision was already made. Had the creek stayed unpredictable with an off-chance of recovery, the same player might well have attempted to reach the green in two. Fortunately, they finally figured this out and portions of that irregular element have been restored to this creek. Maybe they will eventually figure this out on #15 as well. A cool Mackenzie style bunker placed properly would help matters in several ways and restore more temptation and excitment to that golf hole.