Change of Visa type- Non B to O for Marriage ( Thai Spouse) Visa

After working for 11 years in Bangkok with a W/P & Non Imm B Visa I lost my job and took the company to the Labor Court. The judge requested on 2 occasions that immigration should extend my visa for 90 days each time to allow me to remain in Thailand while the court case was ongoing. No Problems.........

Then in November the court case was concluded ( I won- settlement received ) and I managed to get another 90 day extension (Still Non B) for health issues which expires next week. Now I want to change to a Non O visa based on my Thai marriage of 9 years. I am told a different story every time by CWattana Immigration. Some say I have to leave TL and return with an Non O rather than a regular tourist visa. I'm looking at going to the Thai consulate in Penang/Malasia with all my docs and bank statements which tick all the boxes ( Marriage Cert, House Reg, Spouse ID, Bank statement etc.).

As my current visa has no re-entry permit does that mean that if I leave TL before it's expiry date that it will be voided on my exit? 

Some have told me to go to the Lao land border and request a Non O on re-entry. I've looked at many forums regarding visa runs to Lao but it sees like a nightmare getting there. Also I've call the Govt helpline 1111 for advice and they just tell me to talk to Cwattana again.

If anyone could spare some advice I would be very grateful.