Its good that you have a goal and a reason to do all this work.
It seems like you have the strength nailed down. The question is "Are you being overpowered by your opponents?" If not I would stick with what you have. When you get done with a bout are you worn out to the point you couldn't go another round? What I am asking is what is your weakness?
Your technical skill seems to be up there and you roll quite a bit. I am 40 if I did all that you do, in a week, I would be worn out and divorced. Do you recover ok with everything you do?
I would check out Joel Jamieson's book and website (8weeksout.com). He is pretty systematic about S&C. His view is more about improving weakness and staying technically proficient. He gives a baseline for strength and conditioning.
So sorry that I am all over the place.