Just another thing to check regarding your iron shots going right and short. You mentioned that the club-fitter said that you were +2 degrees. This is an adjustment to the lie of your
clubs. It may also be possible that your lie is a wee bit too upright. Take a look at your divot and where any dirt/mud/turf is at on your club. I say do this because if your lie is too upright, the toe of the club will start your divot. When this happens, the toe of your club will slow down and the heel will continue to accelerate through your swing resulting in your shots being "pushed" to the right and obviously, your distance will be affected.
Just my 2 cents worth.