Can I Correct a Visa Category Mistake with Immigration in Thailand?

Hi guys, bit of a complicated situation. So I have a BOI company in Bangkok of which I am the Managing Director. My passport was stolen last year in Phuket and so the visa had to be transferred to my new passport. Apparently Immigration at OSSC Chamchuri Square made a mistake and transferred as non-b but my initial visa I enterred was non-ib. Now I need to extend my visa and single window system tells me I need to contact immigration to change from non-b to non-ib before being able to make the appointment for visa and work permit extension. With my extensive experience with visa and WP in Thailand, I have the feeling this probably won’t be possible as immigration would need to acknowledge that they did a mistake to change it which I don’t think they will. So I am already prepared to fly out and get a new non-b or non-ib and just apply for a new visa and Work Permit. Or anyone thinks there is a chance this might work? I am not in Bangkok right now, otherwise I would just go and ask of course but not sure if it is even worth it or just a waste of time. Maybe someone has experience with this or has been in a similar situation before.

Many thanks, Carl!