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...?
Squat 160kg (352.7lbs), Bench 115kg (252.5lbs), Deadlift 220kg (485lbs)
Front Squat 130kg (286.6lbs), Strict Press 80kg (176.4lbs), Chinups +30kg (+66.1lbs)
My training log