@Milos ****
okay you're confusing a couple things, lets leave the work permit OUT of the picture (as it's not relevant to what you want to do).
Any way you slice it just stamping out DOESN'T cancel your extension officially, and while you could go to a thai consulate and BUY a new Non-O visa based on marriage you will run into difficulties getting it extended INSIDE the country at the immigration office because you have an "open" (uncancelled) Non-B extension in your passport.
That's why we say over and over GO cancel your extension THEN exit the country and get what ever visa you want to get because when you come back there's no issue of an 'open' extension still hanging over your head.