I would suggest trying the simple workouts first, then integrating your other stuff. try starting at level 5 or 6 and see how that goes you might be surprised. Then after you get a sense of how different and why they are different then start integrating.
If you really want to do are your stuff try this
Mon: all reps about .5 max as many rounds as possible in 20 min
wed: 5 rounds just under max rest approx 3 minutes between rounds
Thur: sets that must be broken into abut 5 chunks blow through all afap
Other cool stuff you can try if you want more resistance are handstand push ups, ring dips, ring push ups, ring pull ups, inverted pull ups, and one leg squats. I personally love using rings it adds a whole dynamic stabilizing aspect to workouts.
Here is Jim doing handstand push ups on rings, this takes quite a bit of strength.