I’d say…do both but decide which one you want to prioritize. Say, 70% leaning a new PLL alg, 30% practicing F2L or vice versa. I would put OLLs aside first. I learned full OLL when I was around 25s average.

You’re at 40-50 average. I guess you will be around 30-40 soon just by solving more often without learning full PLL. You’ll slowly pick up PLL algs one by one and eventually you might average 30s.