This goes against your rule #1, but I say to take one more club than you think you need. If you have a GPS that has front-middle-back yardage, go for the back every time. You are probably going to hit it shorter than you think you can hit it. (This is obviously not for low handicappers, but the OP is a 20. I still take more club than I think I need.)