Now, on the subject of training... someone mentioned this (a Systema instructor) and I think it might be worth trying.
Do an intense workout before training, and then when you train, focus on your form... your draw, mag changes, etc. The idea is that your body, being sore and all, will tend to do things in the most efficient motions it can, and the training will make those efficient motions come natural to you.