Irons
Take one more club
Most amateurs are short because they swing harder, not because the club is wrong. Take one more, grip it lightly, and swing at a speed you can repeat.
Distance control is a range skill. Build it there, then trust it when the hole is in front of you.
