Help with short game?

Hey guys I am a 16 handicap player and it seems that the biggest obstacle in getting my game to the next level is short shots. Hitting irons and wedges or shots under 125 yards is a big challenge for me, I have trouble with judging what club to use on those shots and was wondering if you had any tips for judging shot shots? I hit all my clubs driver-7 iron pretty well and am getting acceptable with a putter but if I keep misjudging the green I'm going to go nuts.