Change all of this:
Leader - 2/anchor - 2
Assistance work is all fucked up - change that.
If you add PC, something MUST come out; so choose wisely.
Your conditioning needs to be programmed and “Rowing Ergometer 2000m @ As fast as possible” is an absolute recipe for disaster. I’m not being a dick but this is NOT crossfit or P90X. This is actual training and programming so do not let the little kids come and play with the adults.
Other than that, you are solid. You did your homework and I appreciate it.