Never done IF cause it doesn't really jive with my schedule, but I've read about it.
I would have some of your carbs pre work out, 25% of your daily total. I don't know how you would have energy to train breaking a fast and then just running off two scoops of protein.

Whats your BF%?

Your food choices are good, dont be afraid to eat some beef or pork or tuna!