I'd definitely look into BCAA's, Derek posted the links to the leangains blog and while not an Oly guy he's definitely a fasting guy.
If you still aren't recovering well enough perhaps you should consider alternating the fast days. On really hard days have a regular day, on light/rest days fast as you already do.
Last year I typically just fasted until lunch, PT isn't too strenuous. Then again I wasn't training before PT either. I did the vast majority of my training in the afternoon.
"And for crying out loud. Don't go into the pain cave. I can't stress this enough. Your Totem Animal won't be in there to help you. You'll be on your own. The Pain Cave is for cowards.
Pain is your companion, don't go hide from it."