3 additional thoughts:
1). Short drives off of the Tee? Why are you using the MAX instead of the Hot X, New Covert or Sldr - (all of which are more forgiving than the MAX)? I am not finding much of a problem with the Sldr - (except getting out-driven by one of my fellow CC members with a Hot X lol ).
2.) The Tee shot is much less important than your approach shots. You've got the R11 Irons, which are pretty darned good. You might want to practice with them a little more. Their overall accuracy offsets any Tee advantage a lower level player may have. The R11 3 iron reaches out almost as far as your fairway wood.
3). If you are having trouble landing the ball within 1 or 2 yards of the pin using the MAX Wedges, consider switching to better Wedges.