No, I should have left just after the amnesty was granted because I go the route of not putting the money in the bank and my new 90 days needed to be reset. Otherwise I would have obviously done what you suggest. I'm also just setting up a company so need to apply for a WP, too.
Thanks. I'm going to go to CW with my wife (who has experience of helping with visa services in the past) in the near future and will let you all know what they advise re: Non - O extensions.
For people on multiple entry visas like one year marriage visa without cash deposit, meaning that you have to leave every 90 days, you can now extend within Thailand.