A Wentlers 531 template may be more beneficial.
You can do accessory exercises for hyprotrophy and throw in the calisthenics or metcon.
Here's a sample template:
Day 1:
Squat per template
Bench per template
Hyprotrophy movements involving chest (Skull crushers, DB bench, ect)
Metcon (if you choose)
3-8 minutes involving accessory movements, especially bodyweight or lightweight movements
Day 2
Power clean 5x3@70%, 5x2@80%, 5x1@90% (depending on week)
If uncomfortable doing power cleans, do some sort of barbell row work
Bicep curl
The Absz
Metcon
Hard sprints or tabata training
Day 3
Rest. If you choose, you can do yoga, active stretching, or light swimming work on this day. Don't push it though.
Day 4
Deadlift per template
Press per template
Weighted pullups (follow template) or bw pullups 10x5
Hypertrophy movements involving shoulders/triceps (Shrugs, ect)
Metcon (3-8 min) involving elements of above movements if you choose
Day 5
Olympic lift day (snatch, C+J, ect)
If you choose to not do Oly, do pendlay rows and shrugs today
Any other accessory work you want to do
Ab work
5-10 min metcon
Day 6.
Long effort today (20-60 minutes). this can be a long distance effort, a CrossFit hero/benchmark, or some other activity that taxes the aerobic system.
Day 7
Rest
Note: During deload weeks, scale back your metcons and accessory work.
----------
Another program you could also consider is the Greyskull program. They have hypertrophy work in there, and the program allows for metcon work.