Too many times I've inadvertently fallen victim to the pre-selection of "CHIP" as the swing type for an uphill shot off the green and to the pre-selection of a putting distance (e.g. "30" vs. "15") when caught up in studying a putt. Why not leave those choices (in all cases) up to the player? Let the player choose his/her club, type of shot and distance metric for every shot, just like we do in the real world. We mostly don't have caddies telling us to use a "9-iron" or to use a flop shot vs. a pitch.