Please someone should advice me on this; I have a Non B visa with an extension on it due to expire in three months time,having gotten married with my thai wife and obtained my marriage certificate, then my question is this; Will i be able to extend my stay based on marriage with the Non B visa or should i travel out and get a Non O visa??

You can change the reason for your extension of stay from one based upon working to marriage. On the date you want to change the reason you will need a letter from your employer stating you are no longer working or requesting the cancellation on that date.

You will need to be the financial requirements of 400k baht in a Thai bank in your name only for 2 months or proof of 40k baht.