So, going forward here is the short list of priority stuff.
1. Keep working on the shorter swing feel to get more accustomed to it.
2. Keep working on getting the club more laid off at the top of the swing. Try to figure out how to make it work with the shorter swing feel.
This may seem like an obvious suggestion, but why not try going to the golf range every other week instead of playing?
I used to practice at the range alternating clubs like you would on a course (dr, 7, pw, dr, 9, sw, dr, 5, pw etc...), although obviously you wont have the benefit of of walking the distance of a course.
I found that when I used to go through 100 balls at a fair pace my body felt similar to after a round, albeit I was 25ish and pretty fit anyway so the walking was never really an issue due to playing football/soccer twice a week minimum for the 15 years prior but I digress...
I messed around with it on the range. Tried the head cover under the arm thing but that was no help. It feels like i'm going straight back and straight thru but the results said otherwise. I tried more shoulder turn and that did hit it straighter, but also longer so had to relearn distance a bit. I also think I was short arming the follow through so I let the club head go more down the target line. That may have been the biggest help.
An aside. I'm on the range trying to pitch to the 50 yard marker. Six other guys out there hitting nothing but drivers, side glances at me like they were wondering why go to a range just to hit a wedge.....