So, after months of fiddling to find a program that is time efficient and (hopefully) effective, I have settled on a home-made KB & bodyweight workout 3 days a week, and S&S 3 days a week.
First session of S&S tonight, with 10x10 1H swings at 24 kg in under 6 mins, and 5 sets of TGUs at 16 kg...