@Mark Limbaga , I really like your wave cycle version!
It's similar to Eric Moss's program I'm on from:
How to Program Your Way to 50 Consecutive Pistol Squats | StrongFirst
I'm really enjoying the wave style of training and will probably follow your outline when I switch back to Swings as my main workout.