If you don't plan to travel outside Thailand and don't want to do a border bounce you are better off getting a Tourist Visa before coming. That will give you a 60 day stamp which can be extended by 30 days giving you 90 days total. Otherwise your other option is visa exemption which will get you 30 days plus a 30 day extension (60 days total) and in order to get the last week you will need to leave the country and re-enter again.
Are you on a visa exemption or did you get a Tourist visa before you came here? If you got a visa before you came and haven't already extended it then you can go to immigration and get a 30 day extension.
You need to go to the police HQ in Bangkok near Central World to get police clearance.
Also I could be wrong (90% sure I'm not) but I don't think you can change from a non-ED to a non-B while being in the country. You will need to leave and apply at an embassy in a neighbouring country or leave and re-enter on an exemption and convert the exemption.
No 30 day extension on a non-O you can either do a border bounce and come back in with 30 day visa exemption or you can get a 1 year extension for your non-O.