After looking at your training, I do like a lot of stuff you are doing. My only suggestion/addition to what UT suggested for a set-up would be in place of one of the short approach days, would be a longer bounding day. We do a series of Lefts and Rights working on cleaning up the ground contacts and leg swings.
If you want, I could PM you the series . . .