To be honest, I got a bit bored of pure strength training a few years ago and moved to crossfit. Since then my lifts have almost doubled and my form has improved too.

I think you're doing the absolute right thing with climbing. Its not about finding the most optimal physical return on investment for an hour of work but finding something you love so its not work at all.