Do you want to stay on the Non Immigrant O for any particular reason? Why not switch to a Non Immigrant B? The company can issue all paperwork for this plus you say you have a work permit so this can be applied for again under your B visa. Also if you have a WP already then the minimum wage is
*****
baht. You should have no problem showing the
*****
baht per month on your current O visa right?