Originally Posted by Derek Weaver
CF, at least for me, is perfect as I can cross train my sport as well as my strength and conditioning. Remember that CF is a mix of ME and metcon with a large number of core-centric exercises, and mixed medium to long distance efforts.
I agree with this. Your GJJ training doesn't look too intensive, so just go on the 3 on 1 off CrossFit WOD from the main page. If you start seeing signs of over training, you can scale the WOD's or frequency.