The only reason I didn't suggest Texas Method / Bill Starr / Madcow is because of this:
"I also stopped enjoying it and want to focus on both gaining strength AND bodybuilding esk training."
Not sure if some other posters might have missed that bit...?
41yo, 6'2", ~96kg
best lifts: sq 160kg / bp 115kg / dl 195kg / c&p 80kg
my training log