I was in a similar position about 6 months ago when I started SS to get back into strength training. Definitely a good way to start as I've added 40% to my squats and deadlifts and 20-25% to bench and presses. After finding some coaching on cleans, I too got a taste for the O lifts.
Because I also wanted to incorporate more CF-style metcon (currently pretty fat) I started by kind of following the MTWFS pattern here at PM. I did SS on MWF and O lift technique work on Tues and Sat.
This week I've jumped to the PM WODs, though I still have some fondness for my SS stuff, so I'm adding the occasional assistance exercises to kind of maintain some progress there. I doubt that I'll be able to do that in the Bulgarian cycles, though. Can't have everything.
I'm sure you're on the right track. Like Dan John is fond of saying - everything works, for awhile. Cheers.