I don't know what kind of activity level you run at, 22 blocks at your bw and bf seems pretty high to me. I base that on my doing the WOD as my main exercise and being 177# and 6% bf and doing well at 18 blocks at 3x fat. I've since gone up to 22 blocks at 3x fat to try to gain a bit of weight.
Then again, your activity level may justify your block number. Just thinking out loud.