If you want to be sub-30, you can just drill CFOP solves. Make sure you aren't still making basic mistakes, like doing the cross on the top or misslotting F2L pairs frequently. I am a Roux user, but I still average about 18 seconds with CFOP, and I hardly know any OLL, so you should be fine with two look, especially if you don't care about being that fast.