yeah along the lines of jason, i would always try to add more BJJ or other grappling before adding more S&C.
to be honest, grappling is getting more watered down nowadays with every d-bag wanting to be a fighter now. it's when you focus more on your S&C than your training that you get everything out of whack (unless you're already a "top of the food chain" blackbelt). in general when anybody seems a little too strong to me, i just focus on taking that back, and it normally happens.
with that being said, if you could add another day of grappling, you could prob take out some metcons and focus on strength more. as long as you keep rolling, you'll get pretty conditioned.