I would suggest at this point you have enough basic pull-up strength (7 strict, 11 kipping). The problem is you will be down to single or doubles in the round of 20 for sure, or you will have to rest too long loosing intensity. An experienced CF athlete will get through 30-20-10 pull ups fairly fast.
I would scale just the pull up reps in this situation. It will allow you to maintain intensity and improve you pull up capacity.
18 Pull ups
Once someone has 5 kipping or 3 strict pull ups movement modification doesn't tend to build more pull ups. Pull ups build pull ups.