I’m obviously absolutely married to the old John Meadows’ stuff, and think you might enjoy it too. He actually tended to stick with a pattern/ technique in 3-week blocks, so it would match up perfectly. I felt like it was a good blend of bodybuilding work and core bodybuilding work.
If that sounds interesting at all, he had a free one on here that I found pretty enjoyable:
Then maybe every 4th week you do some MetCon-style workouts. CT had a zombie workout that looked to fit that bill, you just wouldn’t be sticking with the progressions (but I think that’s ok for what you’re doing) or his fire ready program: