One last thing that might help. Looking at your pictures, it looks to me like you could also benifit by moving your elbow away from your body so your forearm is more perpindicular to the guitar neck. It requires that you think about moving that elbow with you move your fingerings up and down the neck. This involves using your shoulder to move the elbow not just moving your hand. Hope that makes sense. Just concentrate on keeping the forearm perpindicular to the neck.

I had to work on that one quite a bit since I had a lazy habit of not keeping the correct forearm position. My PT got me to work on that and it really helped reduce the pain I experience when I played for more than 30 minutes.