Intermediate (ish) student looking for a one-on-one Thai teacher

I can speak, read, and write Thai passably well at the intermediate level. I lived in CM for two years, back in 2000. Back then I was pretty decent, but I've forgotten a lot. I'm in CM until July 27 right now, and I'd like to take the opportunity to regain some of my lost Thai, and improve my fluency.

I am looking for a Thai teacher with some experience, who is willing to use a Thai-only (no English) approach, has access to some materials, and in general can help me structure my study in a sane way. My biggest challenge will be filling the huge gaps I have in my vocabulary, and bringing my reading and writing up to speed.

I'm looking for about 3-6 hours per week, and I'm willing to put in about 10 hours a week outside of class.

If anyone has recommendations, or knows of a school or tutor that would help, I'd greatly appreciate it. Right now I live in the area around Chang Phuak transport station, but I'm willing to travel for lessons.

Thanks in advance for your responses.