Oahu in July - a good school for beginner / intermediate

Hi,
I'm going to Oahu in July and would like to hear some tips on a decent school that will take you on private lessons to different breaks around the island.
I'm based at Waikiki beach, so preferably someone based there or able to do pick-ups.
My level is beginner / intermediate. Still struggling with consistency in catching green waves and my pop-up sucks
, but I don't feel the classic beginner courses are helping me advance much more. I think what I need is someone able to push me a little and to surf different conditions.
Any tips which of the one gazillion surf schools there I should approach?
Yours sincerely
Thomas
I'm going to Oahu in July and would like to hear some tips on a decent school that will take you on private lessons to different breaks around the island.
I'm based at Waikiki beach, so preferably someone based there or able to do pick-ups.
My level is beginner / intermediate. Still struggling with consistency in catching green waves and my pop-up sucks

Any tips which of the one gazillion surf schools there I should approach?
Yours sincerely
Thomas