D,
That's a great alternative, but I don't really see a problem with the original.
Personally I would not make it shorter, but rather rap it around the current RHS greenside bunker so that every part of the hole could really be used. For instance, if the pin were in the left, one could lay up past the LHS fairway bunkers for the best angle, but if it's on the right, the right side becomes the preferred side.
Think 8 at Sand Hills, something along those lines.