On the supplementation side, you might want to try some coenzyme Q10 (Q-10?), zefff. It's been proven to increase the activity of your mitochondria, which will replenish your energy stores faster. I can't remember which off-the-shelf brands are good, so I'll check with my boss, who is a pharmacologist and clued me in about the stuff in the first place.
Personally, the only thing I currently supplement with aside from maximum-strength multivitamins is a growth hormone secretagogue from MHP labs. It needs a disciplined diet as your stomach needs to be empty when taking it at night, but so far, it's been helping my recovery and adaptation heaps.
With regard to your joint symptoms, I've found that taking time out to do circles of each major joint throughout the day helps heaps. Boxing has been stiffening up my knees and hips a lot, since I'm not yet used to the footwork, and so I've been living on joint circles several times a day. Moving the joints around helps to relieve residual compression caused by your training and gets fluid flowing through them, which is important for nutrition and recovery since your joints don't actually have a blood supply (if they do, it's pathological) and depend entirely on diffusion from surrounding blood vessels into the joint fluid for their nutrition. It should also help to break up calcium accretions caused by minor repetitive trauma in your training and at least have you good to go for another day at a time
