How about an "auto-caddie" button, that just resets all of the shot parameters back to the way they were when the shot was loaded, (also the same as when in multiplayer, when the shot timer expires).
Speaking of which, could we have the reset upon shot timer expiration be eliminated? It's a pain in the butt to take all that time setting up a shot, and having the timer run out during the swing, and then having to redo club, shot and aim selection all over again before re-taking the swing.